20201030 maxminapi (#613)

.gitignore

@@ -10,4 +10,5 @@ tmpoutput
 test-results.xml
 *.njsproj
 *.user
-*.orig
+*.orig
+gen.zip

README.md

@@ -13,7 +13,7 @@ debug-output-folder: $(az-output-folder)/_az_debug
 
 use-extension:
   "@autorest/python": "5.4.0"
-  "@autorest/clicommon": "0.5.5"
+  "@autorest/clicommon": "0.5.6"
   #"@autorest/python": "latest"
 
 require:

src/plugins/azgenerator/CodeModelAz.ts

@@ -85,7 +85,8 @@ export interface CodeModelAz {
     Extension_ClientSubscriptionBound: boolean;
     Extension_ClientBaseUrlBound: boolean;
     Extension_ClientAuthenticationPolicy: string;
-    Extension_Mode: string;   
+    Extension_Mode: string;
+    ResourceType: string | undefined;   
 
 
     SelectFirstCommandGroup(): boolean;
@@ -97,6 +98,9 @@ export interface CodeModelAz {
     CommandGroup_DefaultName: string;
     CommandGroup_HasShowCommand: boolean;
     CommandGroup_CliKey: string;
+    CommandGroup_MaxApi: string;
+    CommandGroup_MinApi: string;
+    CommandGroup_ResourceType: string | undefined;
     CommandGroup_Mode: string;
 
     SelectFirstCommand(): boolean;
@@ -108,6 +112,9 @@ export interface CodeModelAz {
     Command_FunctionName: string;
     Command_GetOriginalOperation: any;
     Command_NeedGeneric: boolean;
+    Command_MaxApi: string;
+    Command_MinApi: string;
+    Command_ResourceType: string | undefined;
     Command_GenericSetterParameter(Operation): Parameter;
 
     Command_Help: string;
@@ -127,6 +134,9 @@ export interface CodeModelAz {
     Method_NameCli: string;
     Method_Help: string;
     Method_CliKey: string;
+    Method_MaxApi: string;
+    Method_MinApi: string;
+    Method_ResourceType: string | undefined;
     Method_BodyParameterName: string;
     Method_IsLongRun: boolean;
     Method_GetOriginalOperation: any;
@@ -144,6 +154,9 @@ export interface CodeModelAz {
     MethodParameter_Name: string;
     MethodParameter_NameAz: string;
     MethodParameter_CliKey: string;
+    MethodParameter_MaxApi: string;
+    MethodParameter_MinApi: string;
+    MethodParameter_ResourceType: string | undefined;
     MethodParameter_IsArray: boolean
     MethodParameter_NamePython: string
     MethodParameter_MapsTo: string;

src/plugins/azgenerator/CodeModelAzImpl.ts

@@ -136,6 +136,10 @@ export class CodeModelCliImpl implements CodeModelAz {
         return false;
     }
 
+    public get ResourceType(): string | undefined {
+        return this.formResourceType(this.options?.['resource-type']);
+    }
+
     public get GenChecks(): boolean {
         let disableChecks = this.options?.['disable-checks'];
         if (disableChecks) return false;
@@ -617,6 +621,18 @@ export class CodeModelCliImpl implements CodeModelAz {
         return eps.singularize(this.CommandGroup.language['cli'].cliKey);
     }
 
+    public get CommandGroup_MaxApi(): string {
+        return this.CommandGroup.language['cli']?.['max-api'];
+    }
+
+    public get CommandGroup_MinApi(): string {
+        return this.CommandGroup.language['cli']?.['min-api'];
+    }
+
+    public get CommandGroup_ResourceType(): string | undefined {
+        return this.formResourceType(this.CommandGroup.language['cli']?.['resource-type']);
+    }
+
     public get CommandGroup_CliKey(): string {
         return this.CommandGroup.language['cli']?.cliKey;
     }
@@ -809,6 +825,23 @@ export class CodeModelCliImpl implements CodeModelAz {
         return this.Command?.language?.['cli']?.['extensionMode'];
     }
 
+    public get Command_MaxApi(): string {
+        return this.Command.language['cli']?.['max-api'];
+    }
+
+    public get Command_MinApi(): string {
+        return this.Command.language['cli']?.['min-api'];
+    }
+
+    public get Command_ResourceType(): string | undefined {
+        return this.formResourceType(this.Command.language['cli']?.['resource-type']);
+    }
+
+    public formResourceType(config: string|undefined) {
+        if (isNullOrUndefined(config) || config.startsWith("ResourceType.")) return config;
+        else return "ResourceType." + config;
+    }
+
     //=================================================================================================================
     // Methods / Operations associated with the command.
     //
@@ -911,6 +944,18 @@ export class CodeModelCliImpl implements CodeModelAz {
         return this.Method.language['cli']?.cliKey;
     }
 
+    public get Method_MaxApi(): string {
+        return this.Method.language['cli']?.['max-api'];
+    }
+
+    public get Method_MinApi(): string {
+        return this.Method.language['cli']?.['min-api'];
+    }
+
+    public get Method_ResourceType(): string | undefined {
+        return this.formResourceType(this.Method.language['cli']?.['resource-type']);
+    }
+
     public get Method_BodyParameterName(): string {
         return null;
     }
@@ -1134,6 +1179,18 @@ export class CodeModelCliImpl implements CodeModelAz {
         return this.Parameter_CliKey(this.MethodParameter);
     }
 
+    public get MethodParameter_MaxApi(): string {
+        return this.MethodParameter.language['cli']?.['max-api'];
+    }
+
+    public get MethodParameter_MinApi(): string {
+        return this.MethodParameter.language['cli']?.['min-api'];
+    }
+
+    public get MethodParameter_ResourceType(): string | undefined {
+        return this.formResourceType(this.MethodParameter.language['cli']?.['resource-type']);
+    }
+
     public get MethodParameter_IdPart(): string {
         return this.MethodParameter.language['az']['id_part'];
     }

src/plugins/azgenerator/templates/CliTopInit.ts

@@ -5,7 +5,7 @@
 import { EOL } from 'os';
 import * as path from 'path';
 import { isNullOrUndefined } from "util";
-import { getIndentString, skipCommentLines, ToMultiLine } from "../../../utils/helper";
+import { getIndentString, skipCommentLines, ToMultiLine, composeParamString} from "../../../utils/helper";
 import { GenerationMode, PathConstants } from "../../models";
 import { CodeModelAz } from "../CodeModelAz";
 import { HeaderGenerator } from "../Header";
@@ -113,6 +113,9 @@ export class CliTopInit extends TemplateBase {
     private GenerateAzureCliInit(model: CodeModelAz): string[] {
         let header: HeaderGenerator = new HeaderGenerator();
         header.addFromImport(model.CliCoreLib, ["AzCommandsLoader"]);
+        if (model.ResourceType) {
+            header.addFromImport("azure.cli.core.profiles", ["ResourceType"]);
+        }
         var output: string[] = header.getLines();
         let importPath = "azext_" + model.Extension_NameUnderscored;
         if (model.IsCliCore) {
@@ -138,7 +141,7 @@ export class CliTopInit extends TemplateBase {
         }
         output.push("            client_factory=cf_" + model.Extension_NameUnderscored + "_cl)");
         output.push(`        parent = super(${model.Extension_NameClass}CommandsLoader, self)`);
-        ToMultiLine(`        parent.__init__(cli_ctx=cli_ctx, custom_command_type=${model.Extension_NameUnderscored}_custom)`, output);
+        ToMultiLine(`        parent.__init__(cli_ctx=cli_ctx, custom_command_type=${model.Extension_NameUnderscored}_custom${composeParamString(undefined, undefined, model.ResourceType)[0]})`, output);
         output.push("");
         output.push("    def load_command_table(self, args):");
         output.push("        from " + importPath + ".generated.commands import load_command_table");

src/plugins/azgenerator/templates/generated/CliCommands.ts

@@ -5,11 +5,12 @@
 
 import { CodeModelAz } from "../../CodeModelAz"
 import { HeaderGenerator } from "../../Header";
-import { ToMultiLine, getExtraModeInfo } from "../../../../utils/helper"
+import { ToMultiLine, getExtraModeInfo, composeParamString } from "../../../../utils/helper"
 import { isNullOrUndefined } from "util";
 import { ExtensionMode } from "../../../models";
 
 let showCommandFunctionName = undefined;
+let useResourceType = false;
 export function GenerateAzureCliCommands(model: CodeModelAz): string[] {
     let header: HeaderGenerator = new HeaderGenerator();
 
@@ -54,7 +55,12 @@ export function GenerateAzureCliCommands(model: CodeModelAz): string[] {
                 if (extraInfo != "") {
                     extraInfo = ", " + extraInfo;
                 }
-                ToMultiLine("    with self.command_group('" + model.CommandGroup_Name + "', " + model.Extension_NameUnderscored + "_" + model.GetModuleOperationName() + ", client_factory=" + cf_name + extraInfo + ") as g:", output);
+                let commandGroupOutput = "    with self.command_group('" + model.CommandGroup_Name + "', " + model.Extension_NameUnderscored + "_" + model.GetModuleOperationName() + ", client_factory=" + cf_name + extraInfo;
+                const paramRet = composeParamString(model.CommandGroup_MaxApi, model.CommandGroup_MinApi, model.CommandGroup_ResourceType);
+                commandGroupOutput += paramRet[0];
+                if (paramRet[1])    useResourceType = true;
+                commandGroupOutput += ") as g:";
+                ToMultiLine(commandGroupOutput, output);
                 let needWait = false;
                 do {
                     if (model.Command_IsLongRun && model.CommandGroup_HasShowCommand) {
@@ -78,6 +84,9 @@ export function GenerateAzureCliCommands(model: CodeModelAz): string[] {
     if (output.length + header.getLines().length > 1000) {
         header.disableTooManyLines = true;
     }
+    if (useResourceType) {
+        header.addFromImport("azure.cli.core.profiles", ["ResourceType"]);
+    }
 
     return header.getLines().concat(output);
 }
@@ -114,16 +123,30 @@ function getCommandBody(model: CodeModelAz) {
                 if (model.Command_IsLongRun && !model.SDK_IsTrack1) {
                     generic_update += "', setter_name='begin_create_or_update";
                 }
-                generic_update += "', custom_func_name='" + functionName + "'" + endStr + commandExtraInfo + ')';
+                generic_update += "'";
+                const paramRet = composeParamString(model.Method_MaxApi, model.Method_MinApi, model.Method_ResourceType);
+                generic_update += paramRet[0];
+                if (paramRet[1])    useResourceType = true;
+                generic_update += ", custom_func_name='" + functionName + "'" + endStr + commandExtraInfo + ')';
                 ToMultiLine(generic_update, output);
             }
         } else {
-            ToMultiLine("        g.custom_command('" + methodName + "', '" + functionName + "'" + endStr + commandExtraInfo + ')', output);
+            let customCommand = "        g.custom_command('" + methodName + "', '" + functionName + "'" + endStr + commandExtraInfo;
+            const paramRet = composeParamString(model.Command_MaxApi, model.Command_MinApi, model.Command_ResourceType);
+            customCommand += paramRet[0];
+            if (paramRet[1])    useResourceType = true;
+            customCommand += ")";
+            ToMultiLine(customCommand, output);
         }
     }
     else {
         showCommandFunctionName = functionName;
-        ToMultiLine("        g.custom_show_command('" + methodName + "', '" + functionName + "'" + endStr + commandExtraInfo + ')', output);
+        let customCommand = "        g.custom_show_command('" + methodName + "', '" + functionName + "'" + endStr + commandExtraInfo;
+        const paramRet = composeParamString(model.Command_MaxApi, model.Command_MinApi, model.Command_ResourceType);
+        customCommand += paramRet[0];
+        if (paramRet[1])    useResourceType = true;
+        customCommand += ")";
+        ToMultiLine(customCommand, output);
     }
     return output;
 }

src/plugins/azgenerator/templates/generated/CliParams.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CodeModelAz } from "../../CodeModelAz"
-import { EscapeString, ToCamelCase, Capitalize, ToMultiLine, getExtraModeInfo } from "../../../../utils/helper";
+import { EscapeString, ToCamelCase, Capitalize, ToMultiLine, getExtraModeInfo, composeParamString } from "../../../../utils/helper";
 import { SchemaType, Parameter } from "@azure-tools/codemodel";
 import { HeaderGenerator } from "../../Header";
 import { isNullOrUndefined, isArray } from "util";
@@ -20,6 +20,7 @@ let hasLocation = false;
 let hasLocationValidator = false;
 let hasTags = false;
 let actions: string[] = [];
+let useResourceType = false;
 
 export function GenerateAzureCliParams(model: CodeModelAz, debug: boolean): string[] {
     var output_args: string[] = [];
@@ -109,6 +110,10 @@ export function GenerateAzureCliParams(model: CodeModelAz, debug: boolean): stri
         if (element.length > 120) header.disableLineTooLong = true;
     });
 
+    if (useResourceType){
+        header.addFromImport("azure.cli.core.profiles", ["ResourceType"]);
+    }
+
     return header.getLines().concat(output);
 }
 
@@ -352,6 +357,9 @@ function getCommandBody(model: CodeModelAz, needGeneric: boolean = false, debug:
                     if (!isNullOrUndefined(model.MethodParameter_DefaultConfigKey)) {
                         argument += ", configured_default='" + model.MethodParameter_DefaultConfigKey + "'";
                     }
+                    const paramRet = composeParamString(model.MethodParameter_MaxApi, model.MethodParameter_MinApi, model.MethodParameter_ResourceType);
+                    argument += paramRet[0];
+                    if (paramRet[1])    useResourceType = true;
                     let parameterExtraInfo = "";
                     parameterExtraInfo = getExtraModeInfo(model.MethodParameter_Mode, model.Command_Mode);
                     if (parameterExtraInfo != "") {

src/plugins/azgenerator/templates/tests/CliTestScenario.ts

@@ -60,7 +60,7 @@ export class CliTestScenario extends TemplateBase {
         let initiates: string[] = [];
         let body: string[] = [];
 
-        class_info.push("# Test class for ${scenarioName}");
+        class_info.push(`# Test class for ${scenarioName}`);
         class_info.push("@try_manual");
         class_info.push("class " + Capitalize(this.groupName) + scenarioName + "Test(ScenarioTest):");
         class_info.push("");
@@ -75,7 +75,7 @@ export class CliTestScenario extends TemplateBase {
         }
 
         let decorators: string[] = [];
-        let parameterNames = CliTestStep.InitiateDependencies(model, this.header, decorators, initiates);
+        let parameterNames = CliTestStep.InitiateDependencies(model, this.header, decorators, initiates, this.groupName + "_" + scenarioName);
         let jsonAdded = false;
         
         let funcScenario: string[] = [];
@@ -94,11 +94,13 @@ export class CliTestScenario extends TemplateBase {
                 // find example by name
                 let found = false;
                 let examples: CommandExample[] = [];
-                let exampleIdx = 0;
+                let exampleIdx = -1;
                 for (let exampleCmd of model.FindExampleById(exampleId, commandParams, examples)) {
+                    exampleIdx += 1;
                     if (exampleCmd && exampleCmd.length > 0) {
                         found = true;
-                        let checks = model.GetExampleChecks(examples[exampleIdx++]);
+                        let checks = model.GetExampleChecks(examples[exampleIdx]);
+                        functionName = CliTestStep.ToFunctionName({name: examples[exampleIdx].Id}, exampleCmd[0]);
                         if (checks.length > 0) {
                             funcScenario.push(...ToMultiLine(`    ${disabled}${functionName}(test${CliTestStep.parameterLine(parameterNames)}, checks=[`));
                             for (let check of checks) {

src/plugins/azgenerator/templates/tests/CliTestStep.ts

@@ -9,6 +9,7 @@ import { ToMultiLine, deepCopy } from '../../../../utils/helper';
 import { HeaderGenerator } from "../../Header";
 import { TemplateBase } from "../TemplateBase";
 import { PathConstants } from "../../../models";
+import { isNullOrUndefined } from 'util';
 
 let usePreparers = false;
 let nameMap = {};
@@ -51,8 +52,7 @@ export class CliTestStep extends TemplateBase {
 
         let header: HeaderGenerator = new HeaderGenerator();
 
-        let parameterNames = CliTestStep.InitiateDependencies(model, new HeaderGenerator(), [], []);
-        let jsonAdded = false;
+        let parameterNames = CliTestStep.InitiateDependencies(model, new HeaderGenerator(), [], [], "");
         model.GetResourcePool().clearExampleParams();
 
         // go through the examples to generate steps
@@ -63,14 +63,18 @@ export class CliTestStep extends TemplateBase {
                 let disabled: string = config[ci].disabled ? "# " : "";
                 steps.push("# EXAMPLE: " + exampleId);
                 steps.push("@try_manual");
-                steps.push(...ToMultiLine(`def ${functionName}(test${CliTestStep.parameterLine(parameterNames, true)}):`));
 
                 // find example by name
                 let found = false;
                 let examples: CommandExample[] = [];
-                let exampleIdx = 0;
+                let exampleIdx = -1;
                 for (let exampleCmd of model.FindExampleById(exampleId, commandParams, examples)) {
+                    exampleIdx += 1;
                     if (exampleCmd && exampleCmd.length > 0) {
+                        functionName = CliTestStep.ToFunctionName({name: examples[exampleIdx].Id}, exampleCmd[0]);
+                        if (exampleIdx==0) {
+                            steps.push(...ToMultiLine(`def ${functionName}(test${CliTestStep.parameterLine(parameterNames, true)}):`));
+                        }
                         found = true;
                         if (exampleCmd[0].indexOf(' delete') > -1) {
                             exampleCmd[0] += " -y";
@@ -88,6 +92,7 @@ export class CliTestStep extends TemplateBase {
                     }
                 }
                 if (!found) {
+                    steps.push(...ToMultiLine(`def ${functionName}(test${CliTestStep.parameterLine(parameterNames, true)}):`));
                     steps.push("    # EXAMPLE NOT FOUND!");
                     steps.push("    pass");
                 }
@@ -138,7 +143,7 @@ export class CliTestStep extends TemplateBase {
         return ret;
     }
 
-    public static InitiateDependencies(model: CodeModelAz, header: HeaderGenerator, decorators: string[], initiates: string[]): string[] {
+    public static InitiateDependencies(model: CodeModelAz, header: HeaderGenerator, decorators: string[], initiates: string[], scenarioName: string): string[] {
         let decorated = [];
         let internalObjects = [];
         let parameterNames = [];
@@ -173,7 +178,7 @@ export class CliTestStep extends TemplateBase {
                 decorated.push(entity.info.name);
             }
         }
-        let funcLine = "    def test_" + model.Extension_NameUnderscored + "(self";
+        let funcLine = "    def test_" + scenarioName + "(self";
         for (let parameterName of parameterNames) {
             funcLine += `, ${parameterName}`;
         }
@@ -199,12 +204,17 @@ export class CliTestStep extends TemplateBase {
         return parameterNames;
     }
 
-    public static ToFunctionName(step: any): string {
+    public static ToFunctionName(step: any, azCmd: string=undefined): string {
         let ret: undefined| string = undefined;
-        if (step.name)
-            ret = "step_" + step.name;
-        else if (step.function)
-            ret = step.function;
+        if (isNullOrUndefined(azCmd)) {
+            if (step.name)
+                ret = "step_" + step.name;
+            else if (step.function)
+                ret = step.function;
+        }
+        else {
+            ret = "step_" + azCmd.split(" ").slice(2).join("_");
+        }
         if (!ret) return undefined;
 
         let shortName = ret.split("/").slice(-1)[0];

src/test/scenarios/attestation/output/src/attestation/azext_attestation/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /AttestationProviders/get/AttestationProviders_Get
 @try_manual
-def step__attestationproviders_get(test, rg, rg_2, rg_3, checks=None):
+def step_attestation_provider_show(test, rg, rg_2, rg_3, checks=None):
     if checks is None:
         checks = []
     test.cmd('az attestation attestation-provider show '
@@ -25,7 +25,7 @@ def step__attestationproviders_get(test, rg, rg_2, rg_3, checks=None):
 
 # EXAMPLE: /AttestationProviders/get/AttestationProviders_List
 @try_manual
-def step__attestationproviders_get2(test, rg, rg_2, rg_3, checks=None):
+def step_attestation_provider_provider_list(test, rg, rg_2, rg_3, checks=None):
     if checks is None:
         checks = []
     test.cmd('az attestation attestation-provider provider list '
@@ -35,7 +35,7 @@ def step__attestationproviders_get2(test, rg, rg_2, rg_3, checks=None):
 
 # EXAMPLE: /AttestationProviders/get/AttestationProviders_ListByResourceGroup
 @try_manual
-def step__attestationproviders_get3(test, rg, rg_2, rg_3, checks=None):
+def step_attestation_provider_provider_list(test, rg, rg_2, rg_3, checks=None):
     if checks is None:
         checks = []
     test.cmd('az attestation attestation-provider provider list '
@@ -45,7 +45,7 @@ def step__attestationproviders_get3(test, rg, rg_2, rg_3, checks=None):
 
 # EXAMPLE: /AttestationProviders/patch/AttestationProviders_Update
 @try_manual
-def step__attestationproviders_patch(test, rg, rg_2, rg_3, checks=None):
+def step_attestation_provider_update(test, rg, rg_2, rg_3, checks=None):
     if checks is None:
         checks = []
     test.cmd('az attestation attestation-provider update '
@@ -57,7 +57,7 @@ def step__attestationproviders_patch(test, rg, rg_2, rg_3, checks=None):
 
 # EXAMPLE: /AttestationProviders/delete/AttestationProviders_Delete
 @try_manual
-def step__attestationproviders_delete(test, rg, rg_2, rg_3, checks=None):
+def step_attestation_provider_delete(test, rg, rg_2, rg_3, checks=None):
     if checks is None:
         checks = []
     test.cmd('az attestation attestation-provider delete -y '
@@ -68,7 +68,7 @@ def step__attestationproviders_delete(test, rg, rg_2, rg_3, checks=None):
 
 # EXAMPLE: /Operation/put/AttestationProviders_Create
 @try_manual
-def step__operation_put_attestationproviders_create(test, rg, rg_2, rg_3, checks=None):
+def step_create_provider(test, rg, rg_2, rg_3, checks=None):
     if checks is None:
         checks = []
     test.cmd('az attestation create-provider '
@@ -79,7 +79,7 @@ def step__operation_put_attestationproviders_create(test, rg, rg_2, rg_3, checks
 
 # EXAMPLE: /Operation/get/Operations_List
 @try_manual
-def step__operation_get_operations_list(test, rg, rg_2, rg_3, checks=None):
+def step_list_operation(test, rg, rg_2, rg_3, checks=None):
     if checks is None:
         checks = []
     test.cmd('az attestation list-operation',

src/test/scenarios/attestation/output/src/attestation/azext_attestation/tests/latest/test_attestation_scenario.py

@@ -11,12 +11,12 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step_operations_list
-from .example_steps import step_attestationproviders_create
-from .example_steps import step_attestationproviders_get
-from .example_steps import step_attestationproviders_list
-from .example_steps import step_attestationproviders_listbyresourcegroup
-from .example_steps import step_attestationproviders_delete
+from .example_steps import step_list_operation
+from .example_steps import step_create_provider
+from .example_steps import step_attestation_provider_show
+from .example_steps import step_attestation_provider_provider_list
+from .example_steps import step_attestation_provider_provider_list
+from .example_steps import step_attestation_provider_delete
 from .. import (
     try_manual,
     raise_if,
@@ -49,25 +49,25 @@ def cleanup_scenario(test, rg, rg_2, rg_3):
 @try_manual
 def call_scenario(test, rg, rg_2, rg_3):
     setup_scenario(test, rg, rg_2, rg_3)
-    step_operations_list(test, rg, rg_2, rg_3, checks=[])
-    step_attestationproviders_create(test, rg, rg_2, rg_3, checks=[])
-    step_attestationproviders_get(test, rg, rg_2, rg_3, checks=[])
+    step_list_operation(test, rg, rg_2, rg_3, checks=[])
+    step_create_provider(test, rg, rg_2, rg_3, checks=[])
+    step_attestation_provider_show(test, rg, rg_2, rg_3, checks=[])
     mytest(test, rg, rg_2, rg_3)
-    step_attestationproviders_list(test, rg, rg_2, rg_3, checks=[])
-    step_attestationproviders_listbyresourcegroup(test, rg, rg_2, rg_3, checks=[])
-    step_attestationproviders_delete(test, rg, rg_2, rg_3, checks=[])
+    step_attestation_provider_provider_list(test, rg, rg_2, rg_3, checks=[])
+    step_attestation_provider_provider_list(test, rg, rg_2, rg_3, checks=[])
+    step_attestation_provider_delete(test, rg, rg_2, rg_3, checks=[])
     cleanup_scenario(test, rg, rg_2, rg_3)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class AttestationScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestattestation_MyResourceGroup'[:7], key='rg', parameter_name='rg')
     @ResourceGroupPreparer(name_prefix='clitestattestation_testrg1'[:7], key='rg_2', parameter_name='rg_2')
-    @ResourceGroupPreparer(name_prefix='clitestattestation_sample-resource-group'[:7], key='rg_3', parameter_name=''
-                           'rg_3')
-    def test_attestation(self, rg, rg_2, rg_3):
+    @ResourceGroupPreparer(name_prefix='clitestattestation_sample-resource-group'[:7], key='rg_3',
+                           parameter_name='rg_3')
+    def test_attestation_Scenario(self, rg, rg_2, rg_3):
 
         call_scenario(self, rg, rg_2, rg_3)
         calc_coverage(__file__)

src/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/generated/commands.py

@@ -21,5 +21,6 @@ def load_command_table(self, _):
         client_factory=cf_virtual_machine)
     with self.command_group('vm virtual-machine', vm_virtual_machine, client_factory=cf_virtual_machine,
                             is_experimental=True) as g:
-        g.custom_command('assess-patch', 'vm_virtual_machine_assess_patch', supports_no_wait=True)
+        g.custom_command('assess-patch', 'vm_virtual_machine_assess_patch', supports_no_wait=True,
+                         min_api='2020-06-01')
         g.custom_wait_command('wait', 'undefined')

src/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /VirtualMachines/post/Assess patch state of a virtual machine.
 @try_manual
-def step__virtualmachines_post(test, rg, checks=None):
+def step_virtual_machine_assess_patch(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az vm virtual-machine assess-patch '

src/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_scenario_incrementalGenerated.py

@@ -11,7 +11,7 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step__virtualmachines_post
+from .example_steps import step_virtual_machine_assess_patch
 from .. import (
     try_manual,
     raise_if,
@@ -38,16 +38,16 @@ def cleanup_scenario(test, rg):
 @try_manual
 def call_scenario(test, rg):
     setup_scenario(test, rg)
-    step__virtualmachines_post(test, rg, checks=[])
+    step_virtual_machine_assess_patch(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class VmScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestvm_myResourceGroupName'[:7], key='rg', parameter_name='rg')
-    def test_vm(self, rg):
+    def test_vm_Scenario(self, rg):
 
         call_scenario(self, rg)
         calc_coverage(__file__)

src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /Factories/put/Factories_CreateOrUpdate
 @try_manual
-def step__factories_put_factories_createorupdate(test, rg, checks=None):
+def step_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory create '
@@ -28,7 +28,7 @@ def step__factories_put_factories_createorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Factories/get/Factories_Get
 @try_manual
-def step__factories_get_factories_get(test, rg, checks=None):
+def step_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory show '
@@ -39,7 +39,7 @@ def step__factories_get_factories_get(test, rg, checks=None):
 
 # EXAMPLE: /Factories/get/Factories_List
 @try_manual
-def step__factories_get_factories_list(test, rg, checks=None):
+def step_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory list '
@@ -49,7 +49,7 @@ def step__factories_get_factories_list(test, rg, checks=None):
 
 # EXAMPLE: /Factories/get/Factories_ListByResourceGroup
 @try_manual
-def step__factories_get_factories_listbyresourcegroup(test, rg, checks=None):
+def step_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory list '
@@ -59,7 +59,7 @@ def step__factories_get_factories_listbyresourcegroup(test, rg, checks=None):
 
 # EXAMPLE: /Factories/patch/Factories_Update
 @try_manual
-def step__factories_patch_factories_update(test, rg, checks=None):
+def step_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory update '
@@ -71,7 +71,7 @@ def step__factories_patch_factories_update(test, rg, checks=None):
 
 # EXAMPLE: /Factories/post/Factories_ConfigureFactoryRepo
 @try_manual
-def step__factories_post(test, rg, checks=None):
+def step_configure_factory_repo(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory configure-factory-repo '
@@ -85,7 +85,7 @@ def step__factories_post(test, rg, checks=None):
 
 # EXAMPLE: /Factories/post/Factories_GetDataPlaneAccess
 @try_manual
-def step__factories_post_factories_getdataplaneaccess(test, rg, checks=None):
+def step_get_data_plane_access(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory get-data-plane-access '
@@ -101,7 +101,7 @@ def step__factories_post_factories_getdataplaneaccess(test, rg, checks=None):
 
 # EXAMPLE: /Factories/post/Factories_GetGitHubAccessToken
 @try_manual
-def step__factories_post2(test, rg, checks=None):
+def step_get_git_hub_access_token(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory get-git-hub-access-token '
@@ -115,7 +115,7 @@ def step__factories_post2(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/put/IntegrationRuntimes_Create
 @try_manual
-def step__integrationruntimes_put(test, rg, checks=None):
+def step_integration_runtime_self_hosted_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime self-hosted create '
@@ -128,7 +128,7 @@ def step__integrationruntimes_put(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/get/IntegrationRuntimes_Get
 @try_manual
-def step__integrationruntimes_get(test, rg, checks=None):
+def step_integration_runtime_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime show '
@@ -140,7 +140,7 @@ def step__integrationruntimes_get(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/get/IntegrationRuntimes_ListByFactory
 @try_manual
-def step__integrationruntimes_get2(test, rg, checks=None):
+def step_integration_runtime_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime list '
@@ -151,7 +151,7 @@ def step__integrationruntimes_get2(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/patch/IntegrationRuntimes_Update
 @try_manual
-def step__integrationruntimes_patch(test, rg, checks=None):
+def step_integration_runtime_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime update '
@@ -165,7 +165,7 @@ def step__integrationruntimes_patch(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_CreateLinkedIntegrationRuntime
 @try_manual
-def step__integrationruntimes_post(test, rg, checks=None):
+def step_integration_runtime_linked(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime linked-integration-runtime create '
@@ -182,7 +182,7 @@ def step__integrationruntimes_post(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_GetConnectionInfo
 @try_manual
-def step__integrationruntimes_post2(test, rg, checks=None):
+def step_integration_runtime_get_connection_info(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime get-connection-info '
@@ -194,7 +194,7 @@ def step__integrationruntimes_post2(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_GetMonitoringData
 @try_manual
-def step__integrationruntimes_post3(test, rg, checks=None):
+def step_integration_runtime_get_monitoring_data(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime get-monitoring-data '
@@ -206,7 +206,7 @@ def step__integrationruntimes_post3(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_GetStatus
 @try_manual
-def step__integrationruntimes_post4(test, rg, checks=None):
+def step_integration_runtime_get_status(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime get-status '
@@ -218,7 +218,7 @@ def step__integrationruntimes_post4(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_ListAuthKeys
 @try_manual
-def step__integrationruntimes_post5(test, rg, checks=None):
+def step_integration_runtime_list_auth_key(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime list-auth-key '
@@ -230,7 +230,7 @@ def step__integrationruntimes_post5(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_RegenerateAuthKey
 @try_manual
-def step__integrationruntimes_post6(test, rg, checks=None):
+def step_integration_runtime_regenerate_auth_key(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime regenerate-auth-key '
@@ -243,7 +243,7 @@ def step__integrationruntimes_post6(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_RemoveLinks
 @try_manual
-def step__integrationruntimes_post7(test, rg, checks=None):
+def step_integration_runtime_remove_link(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime remove-link '
@@ -256,7 +256,7 @@ def step__integrationruntimes_post7(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_Start
 @try_manual
-def step__integrationruntimes_post8(test, rg, checks=None):
+def step_integration_runtime_start(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime start '
@@ -268,7 +268,7 @@ def step__integrationruntimes_post8(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_Stop
 @try_manual
-def step__integrationruntimes_post9(test, rg, checks=None):
+def step_integration_runtime_stop(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime stop '
@@ -280,7 +280,7 @@ def step__integrationruntimes_post9(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_SyncCredentials
 @try_manual
-def step__integrationruntimes_post10(test, rg, checks=None):
+def step_integration_runtime_sync_credentials(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime sync-credentials '
@@ -292,7 +292,7 @@ def step__integrationruntimes_post10(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/post/IntegrationRuntimes_Upgrade
 @try_manual
-def step__integrationruntimes_post11(test, rg, checks=None):
+def step_integration_runtime_upgrade(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime upgrade '
@@ -304,7 +304,7 @@ def step__integrationruntimes_post11(test, rg, checks=None):
 
 # EXAMPLE: /IntegrationRuntimes/delete/IntegrationRuntimes_Delete
 @try_manual
-def step__integrationruntimes_delete(test, rg, checks=None):
+def step_integration_runtime_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory integration-runtime delete -y '
@@ -316,7 +316,7 @@ def step__integrationruntimes_delete(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/put/Triggers_Create
 @try_manual
-def step__triggers_put_triggers_create(test, rg, checks=None):
+def step_trigger_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger create '
@@ -333,7 +333,7 @@ def step__triggers_put_triggers_create(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/put/Triggers_Update
 @try_manual
-def step__triggers_put_triggers_update(test, rg, checks=None):
+def step_trigger_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger update '
@@ -346,7 +346,7 @@ def step__triggers_put_triggers_update(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/get/Triggers_Get
 @try_manual
-def step__triggers_get_triggers_get(test, rg, checks=None):
+def step_trigger_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger show '
@@ -358,7 +358,7 @@ def step__triggers_get_triggers_get(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/get/Triggers_ListByFactory
 @try_manual
-def step__triggers_get_triggers_listbyfactory(test, rg, checks=None):
+def step_trigger_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger list '
@@ -369,7 +369,7 @@ def step__triggers_get_triggers_listbyfactory(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/post/Triggers_GetEventSubscriptionStatus
 @try_manual
-def step__triggers_post(test, rg, checks=None):
+def step_trigger_get_event_subscription_status(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger get-event-subscription-status '
@@ -381,7 +381,7 @@ def step__triggers_post(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/post/Triggers_QueryByFactory
 @try_manual
-def step__triggers_post_triggers_querybyfactory(test, rg, checks=None):
+def step_trigger_query_by_factory(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger query-by-factory '
@@ -393,7 +393,7 @@ def step__triggers_post_triggers_querybyfactory(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/post/Triggers_Start
 @try_manual
-def step__triggers_post_triggers_start(test, rg, checks=None):
+def step_trigger_start(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger start '
@@ -405,7 +405,7 @@ def step__triggers_post_triggers_start(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/post/Triggers_Stop
 @try_manual
-def step__triggers_post_triggers_stop(test, rg, checks=None):
+def step_trigger_stop(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger stop '
@@ -417,7 +417,7 @@ def step__triggers_post_triggers_stop(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/post/Triggers_SubscribeToEvents
 @try_manual
-def step__triggers_post_triggers_subscribetoevents(test, rg, checks=None):
+def step_trigger_subscribe_to_event(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger subscribe-to-event '
@@ -429,7 +429,7 @@ def step__triggers_post_triggers_subscribetoevents(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/post/Triggers_UnsubscribeFromEvents
 @try_manual
-def step__triggers_post_triggers_unsubscribefromevents(test, rg, checks=None):
+def step_trigger_unsubscribe_from_event(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger unsubscribe-from-event '
@@ -441,7 +441,7 @@ def step__triggers_post_triggers_unsubscribefromevents(test, rg, checks=None):
 
 # EXAMPLE: /Triggers/delete/Triggers_Delete
 @try_manual
-def step__triggers_delete_triggers_delete(test, rg, checks=None):
+def step_trigger_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory trigger delete -y '
@@ -453,7 +453,7 @@ def step__triggers_delete_triggers_delete(test, rg, checks=None):
 
 # EXAMPLE: /Factories/delete/Factories_Delete
 @try_manual
-def step__factories_delete_factories_delete(test, rg, checks=None):
+def step_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az datafactory delete -y '

src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/tests/latest/test_datafactory_scenario.py

@@ -11,42 +11,42 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step__factories_put_factories_createorupdate
-from .example_steps import step__factories_get_factories_get
-from .example_steps import step__factories_get_factories_list
-from .example_steps import step__factories_get_factories_listbyresourcegroup
-from .example_steps import step__factories_patch_factories_update
-from .example_steps import step__factories_post
-from .example_steps import step__factories_post_factories_getdataplaneaccess
-from .example_steps import step__factories_post2
-from .example_steps import step__integrationruntimes_put
-from .example_steps import step__integrationruntimes_get
-from .example_steps import step__integrationruntimes_get2
-from .example_steps import step__integrationruntimes_patch
-from .example_steps import step__integrationruntimes_post
-from .example_steps import step__integrationruntimes_post2
-from .example_steps import step__integrationruntimes_post3
-from .example_steps import step__integrationruntimes_post4
-from .example_steps import step__integrationruntimes_post5
-from .example_steps import step__integrationruntimes_post6
-from .example_steps import step__integrationruntimes_post7
-from .example_steps import step__integrationruntimes_post8
-from .example_steps import step__integrationruntimes_post9
-from .example_steps import step__integrationruntimes_post10
-from .example_steps import step__integrationruntimes_post11
-from .example_steps import step__integrationruntimes_delete
-from .example_steps import step__triggers_put_triggers_create
-from .example_steps import step__triggers_put_triggers_update
-from .example_steps import step__triggers_get_triggers_get
-from .example_steps import step__triggers_get_triggers_listbyfactory
-from .example_steps import step__triggers_post
-from .example_steps import step__triggers_post_triggers_querybyfactory
-from .example_steps import step__triggers_post_triggers_start
-from .example_steps import step__triggers_post_triggers_stop
-from .example_steps import step__triggers_post_triggers_subscribetoevents
-from .example_steps import step__triggers_post_triggers_unsubscribefromevents
-from .example_steps import step__triggers_delete_triggers_delete
-from .example_steps import step__factories_delete_factories_delete
+from .example_steps import step_create
+from .example_steps import step_show
+from .example_steps import step_list
+from .example_steps import step_list
+from .example_steps import step_update
+from .example_steps import step_configure_factory_repo
+from .example_steps import step_get_data_plane_access
+from .example_steps import step_get_git_hub_access_token
+from .example_steps import step_integration_runtime_self_hosted_create
+from .example_steps import step_integration_runtime_show
+from .example_steps import step_integration_runtime_list
+from .example_steps import step_integration_runtime_update
+from .example_steps import step_integration_runtime_linked
+from .example_steps import step_integration_runtime_get_connection_info
+from .example_steps import step_integration_runtime_get_monitoring_data
+from .example_steps import step_integration_runtime_get_status
+from .example_steps import step_integration_runtime_list_auth_key
+from .example_steps import step_integration_runtime_regenerate_auth_key
+from .example_steps import step_integration_runtime_remove_link
+from .example_steps import step_integration_runtime_start
+from .example_steps import step_integration_runtime_stop
+from .example_steps import step_integration_runtime_sync_credentials
+from .example_steps import step_integration_runtime_upgrade
+from .example_steps import step_integration_runtime_delete
+from .example_steps import step_trigger_create
+from .example_steps import step_trigger_update
+from .example_steps import step_trigger_show
+from .example_steps import step_trigger_list
+from .example_steps import step_trigger_get_event_subscription_status
+from .example_steps import step_trigger_query_by_factory
+from .example_steps import step_trigger_start
+from .example_steps import step_trigger_stop
+from .example_steps import step_trigger_subscribe_to_event
+from .example_steps import step_trigger_unsubscribe_from_event
+from .example_steps import step_trigger_delete
+from .example_steps import step_delete
 from .. import (
     try_manual,
     raise_if,
@@ -73,51 +73,51 @@ def cleanup_scenario(test, rg):
 @try_manual
 def call_scenario(test, rg):
     setup_scenario(test, rg)
-    step__factories_put_factories_createorupdate(test, rg, checks=[])
-    step__factories_get_factories_get(test, rg, checks=[])
-    step__factories_get_factories_list(test, rg, checks=[])
-    step__factories_get_factories_listbyresourcegroup(test, rg, checks=[])
-    step__factories_patch_factories_update(test, rg, checks=[])
-    step__factories_post(test, rg, checks=[])
-    step__factories_post_factories_getdataplaneaccess(test, rg, checks=[])
-    step__factories_post2(test, rg, checks=[])
-    step__integrationruntimes_put(test, rg, checks=[])
-    step__integrationruntimes_get(test, rg, checks=[])
-    step__integrationruntimes_get2(test, rg, checks=[])
-    step__integrationruntimes_patch(test, rg, checks=[])
-    step__integrationruntimes_post(test, rg, checks=[])
-    step__integrationruntimes_post2(test, rg, checks=[])
-    step__integrationruntimes_post3(test, rg, checks=[])
-    step__integrationruntimes_post4(test, rg, checks=[])
-    step__integrationruntimes_post5(test, rg, checks=[])
-    step__integrationruntimes_post6(test, rg, checks=[])
-    step__integrationruntimes_post7(test, rg, checks=[])
-    step__integrationruntimes_post8(test, rg, checks=[])
-    step__integrationruntimes_post9(test, rg, checks=[])
-    step__integrationruntimes_post10(test, rg, checks=[])
-    step__integrationruntimes_post11(test, rg, checks=[])
-    step__integrationruntimes_delete(test, rg, checks=[])
-    step__triggers_put_triggers_create(test, rg, checks=[])
-    step__triggers_put_triggers_update(test, rg, checks=[])
-    step__triggers_get_triggers_get(test, rg, checks=[])
-    step__triggers_get_triggers_listbyfactory(test, rg, checks=[])
-    step__triggers_post(test, rg, checks=[])
-    step__triggers_post_triggers_querybyfactory(test, rg, checks=[])
-    step__triggers_post_triggers_start(test, rg, checks=[])
-    step__triggers_post_triggers_stop(test, rg, checks=[])
-    step__triggers_post_triggers_subscribetoevents(test, rg, checks=[])
-    step__triggers_post_triggers_unsubscribefromevents(test, rg, checks=[])
-    step__triggers_delete_triggers_delete(test, rg, checks=[])
-    step__factories_delete_factories_delete(test, rg, checks=[])
+    step_create(test, rg, checks=[])
+    step_show(test, rg, checks=[])
+    step_list(test, rg, checks=[])
+    step_list(test, rg, checks=[])
+    step_update(test, rg, checks=[])
+    step_configure_factory_repo(test, rg, checks=[])
+    step_get_data_plane_access(test, rg, checks=[])
+    step_get_git_hub_access_token(test, rg, checks=[])
+    step_integration_runtime_self_hosted_create(test, rg, checks=[])
+    step_integration_runtime_show(test, rg, checks=[])
+    step_integration_runtime_list(test, rg, checks=[])
+    step_integration_runtime_update(test, rg, checks=[])
+    step_integration_runtime_linked(test, rg, checks=[])
+    step_integration_runtime_get_connection_info(test, rg, checks=[])
+    step_integration_runtime_get_monitoring_data(test, rg, checks=[])
+    step_integration_runtime_get_status(test, rg, checks=[])
+    step_integration_runtime_list_auth_key(test, rg, checks=[])
+    step_integration_runtime_regenerate_auth_key(test, rg, checks=[])
+    step_integration_runtime_remove_link(test, rg, checks=[])
+    step_integration_runtime_start(test, rg, checks=[])
+    step_integration_runtime_stop(test, rg, checks=[])
+    step_integration_runtime_sync_credentials(test, rg, checks=[])
+    step_integration_runtime_upgrade(test, rg, checks=[])
+    step_integration_runtime_delete(test, rg, checks=[])
+    step_trigger_create(test, rg, checks=[])
+    step_trigger_update(test, rg, checks=[])
+    step_trigger_show(test, rg, checks=[])
+    step_trigger_list(test, rg, checks=[])
+    step_trigger_get_event_subscription_status(test, rg, checks=[])
+    step_trigger_query_by_factory(test, rg, checks=[])
+    step_trigger_start(test, rg, checks=[])
+    step_trigger_stop(test, rg, checks=[])
+    step_trigger_subscribe_to_event(test, rg, checks=[])
+    step_trigger_unsubscribe_from_event(test, rg, checks=[])
+    step_trigger_delete(test, rg, checks=[])
+    step_delete(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class DatafactoryScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestdatafactory_exampleResourceGroup'[:7], key='rg', parameter_name='rg')
-    def test_datafactory(self, rg):
+    def test_datafactory_Scenario(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/kusto/output/coredefault/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py

@@ -178,8 +178,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -195,8 +195,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
         c.argument('principal_id', type=str, help='The principal ID assigned to the cluster principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['AllDatabasesAdmin', 'AllDatabasesViewer']), help='Cluster '
@@ -207,14 +207,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -223,8 +223,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -238,8 +238,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('read_write_database', action=AddReadWriteDatabase, nargs='*', help='Class representing a read '
                    'write database.', arg_group='Parameters')
         c.argument('read_only_following_database', action=AddReadOnlyFollowingDatabase, nargs='*', help='Class '
@@ -248,14 +248,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto database delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database add-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database list-principal') as c:
@@ -266,15 +266,15 @@ def load_arguments(self, _):
     with self.argument_context('kusto database remove-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database-principal-assignment list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -284,10 +284,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -304,10 +304,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
         c.argument('principal_id', type=str, help='The principal ID assigned to the database principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['Admin', 'Ingestor', 'Monitor', 'User', 'UnrestrictedViewers',
@@ -318,18 +318,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto attached-database-configuration list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -354,8 +354,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration update') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -369,8 +369,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -394,17 +394,17 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection create') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('event_hub_data_connection', action=AddEventHubDataConnection, nargs='*', help='Class representing '
                    'an event hub data connection.', arg_group='Parameters')
         c.argument('iot_hub_data_connection', action=AddIotHubDataConnection, nargs='*', help='Class representing an '
@@ -415,10 +415,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('event_hub_data_connection', action=AddEventHubDataConnection, nargs='*', help='Class representing '
                    'an event hub data connection.', arg_group='Parameters')
         c.argument('iot_hub_data_connection', action=AddIotHubDataConnection, nargs='*', help='Class representing an '
@@ -429,18 +429,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('event_hub_data_connection', action=AddEventHubDataConnection, nargs='*', help='Class representing '
                    'an event hub data connection.', arg_group='Properties')
         c.argument('iot_hub_data_connection', action=AddIotHubDataConnection, nargs='*', help='Class representing an '
@@ -451,7 +451,7 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')

src/test/scenarios/kusto/output/coredefault/src/azure-cli/azure/cli/command_modules/kusto/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /AttachedDatabaseConfigurations/put/AttachedDatabaseConfigurationsCreateOrUpdate
 @try_manual
-def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
+def step_attached_database_configuration_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration create '
@@ -35,7 +35,7 @@ def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/AttachedDatabaseConfigurationsGet
 @try_manual
-def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
+def step_attached_database_configuration_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration show '
@@ -47,7 +47,7 @@ def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/KustoAttachedDatabaseConfigurationsListByCluster
 @try_manual
-def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
+def step_attached_database_configuration_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration list '
@@ -58,7 +58,7 @@ def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/put/KustoClustersCreateOrUpdate
 @try_manual
-def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
+def step_cluster_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster create '
@@ -79,7 +79,7 @@ def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersGet
 @try_manual
-def step__clusters_get_kustoclustersget(test, rg, checks=None):
+def step_cluster_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster show '
@@ -90,7 +90,7 @@ def step__clusters_get_kustoclustersget(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersList
 @try_manual
-def step__clusters_get_kustoclusterslist(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -100,7 +100,7 @@ def step__clusters_get_kustoclusterslist(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListByResourceGroup
 @try_manual
-def step__clusters_get(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -110,7 +110,7 @@ def step__clusters_get(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListResourceSkus
 @try_manual
-def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -121,7 +121,7 @@ def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListSkus
 @try_manual
-def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -131,7 +131,7 @@ def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/patch/KustoClustersUpdate
 @try_manual
-def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
+def step_cluster_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster update '
@@ -148,7 +148,7 @@ def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterAddLanguageExtensions
 @try_manual
-def step__clusters_post(test, rg, checks=None):
+def step_cluster_add_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster add-language-extension '
@@ -161,7 +161,7 @@ def step__clusters_post(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDetachFollowerDatabases
 @try_manual
-def step__clusters_post2(test, rg, checks=None):
+def step_cluster_detach_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster detach-follower-database '
@@ -175,7 +175,7 @@ def step__clusters_post2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDiagnoseVirtualNetwork
 @try_manual
-def step__clusters_post3(test, rg, checks=None):
+def step_cluster_diagnose_virtual_network(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster diagnose-virtual-network '
@@ -186,7 +186,7 @@ def step__clusters_post3(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListFollowerDatabases
 @try_manual
-def step__clusters_post4(test, rg, checks=None):
+def step_cluster_list_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-follower-database '
@@ -197,7 +197,7 @@ def step__clusters_post4(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListLanguageExtensions
 @try_manual
-def step__clusters_post5(test, rg, checks=None):
+def step_cluster_list_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-language-extension '
@@ -208,7 +208,7 @@ def step__clusters_post5(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterRemoveLanguageExtensions
 @try_manual
-def step__clusters_post6(test, rg, checks=None):
+def step_cluster_remove_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster remove-language-extension '
@@ -221,7 +221,7 @@ def step__clusters_post6(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStart
 @try_manual
-def step__clusters_post_kustoclustersstart(test, rg, checks=None):
+def step_cluster_start(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster start '
@@ -232,7 +232,7 @@ def step__clusters_post_kustoclustersstart(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStop
 @try_manual
-def step__clusters_post_kustoclustersstop(test, rg, checks=None):
+def step_cluster_stop(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster stop '
@@ -243,7 +243,7 @@ def step__clusters_post_kustoclustersstop(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/put/KustoClusterPrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__clusterprincipalassignments_put(test, rg, checks=None):
+def step_cluster_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment create '
@@ -259,7 +259,7 @@ def step__clusterprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoClusterPrincipalAssignmentsGet
 @try_manual
-def step__clusterprincipalassignments_get(test, rg, checks=None):
+def step_cluster_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment show '
@@ -271,7 +271,7 @@ def step__clusterprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_cluster_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment list '
@@ -282,7 +282,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/put/KustoDatabasePrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__databaseprincipalassignments_put(test, rg, checks=None):
+def step_database_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment create '
@@ -299,7 +299,7 @@ def step__databaseprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoDatabasePrincipalAssignmentsGet
 @try_manual
-def step__databaseprincipalassignments_get(test, rg, checks=None):
+def step_database_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment show '
@@ -312,7 +312,7 @@ def step__databaseprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_database_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment list '
@@ -324,7 +324,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/delete/KustoDatabasePrincipalAssignmentsDelete
 @try_manual
-def step__databaseprincipalassignments_delete(test, rg, checks=None):
+def step_database_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment delete -y '
@@ -337,7 +337,7 @@ def step__databaseprincipalassignments_delete(test, rg, checks=None):
 
 # EXAMPLE: /Databases/put/KustoDatabasesCreateOrUpdate
 @try_manual
-def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
+def step_database_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database create '
@@ -350,7 +350,7 @@ def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesGet
 @try_manual
-def step__databases_get_kustodatabasesget(test, rg, checks=None):
+def step_database_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database show '
@@ -362,7 +362,7 @@ def step__databases_get_kustodatabasesget(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_database_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list '
@@ -373,7 +373,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /Databases/patch/KustoDatabasesUpdate
 @try_manual
-def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
+def step_database_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database update '
@@ -386,7 +386,7 @@ def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseAddPrincipals
 @try_manual
-def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
+def step_database_add_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database add-principal '
@@ -401,7 +401,7 @@ def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseListPrincipals
 @try_manual
-def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
+def step_database_list_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list-principal '
@@ -413,7 +413,7 @@ def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseRemovePrincipals
 @try_manual
-def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
+def step_database_remove_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database remove-principal '
@@ -428,7 +428,7 @@ def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/delete/KustoDatabasesDelete
 @try_manual
-def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
+def step_database_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database delete -y '
@@ -440,7 +440,7 @@ def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/put/KustoDataConnectionsCreateOrUpdate
 @try_manual
-def step__dataconnections_put(test, rg, checks=None):
+def step_data_connection_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection create '
@@ -456,7 +456,7 @@ def step__dataconnections_put(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_data_connection_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection list '
@@ -468,7 +468,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDataConnectionsGet
 @try_manual
-def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
+def step_data_connection_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection show '
@@ -481,7 +481,7 @@ def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/patch/KustoDataConnectionsUpdate
 @try_manual
-def step__dataconnections_patch(test, rg, checks=None):
+def step_data_connection_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection update '
@@ -497,7 +497,7 @@ def step__dataconnections_patch(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/post/KustoDataConnectionValidation
 @try_manual
-def step__dataconnections_post(test, rg, checks=None):
+def step_data_connection_data_connection_validation(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection data-connection-validation '
@@ -513,7 +513,7 @@ def step__dataconnections_post(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/delete/KustoDataConnectionsDelete
 @try_manual
-def step__dataconnections_delete(test, rg, checks=None):
+def step_data_connection_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection delete -y '
@@ -526,7 +526,7 @@ def step__dataconnections_delete(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/delete/KustoClustersDelete
 @try_manual
-def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
+def step_cluster_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster delete -y '
@@ -537,7 +537,7 @@ def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/delete/AttachedDatabaseConfigurationsDelete
 @try_manual
-def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
+def step_attached_database_configuration_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration delete -y '
@@ -549,7 +549,7 @@ def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/delete/KustoClusterPrincipalAssignmentsDelete
 @try_manual
-def step__clusterprincipalassignments_delete(test, rg, checks=None):
+def step_cluster_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment delete -y '

src/test/scenarios/kusto/output/coredefault/src/azure-cli/azure/cli/command_modules/kusto/tests/latest/test_kusto_scenario.py

@@ -11,48 +11,48 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step__attacheddatabaseconfigurations_put
-from .example_steps import step__attacheddatabaseconfigurations_get
-from .example_steps import step__attacheddatabaseconfigurations_get2
-from .example_steps import step__clusters_put_kustoclusterscreateorupdate
-from .example_steps import step__clusters_get_kustoclustersget
-from .example_steps import step__clusters_get_kustoclusterslist
-from .example_steps import step__clusters_get
-from .example_steps import step__clusters_get_kustoclusterslistresourceskus
-from .example_steps import step__clusters_get_kustoclusterslistskus
-from .example_steps import step__clusters_patch_kustoclustersupdate
-from .example_steps import step__clusters_post
-from .example_steps import step__clusters_post2
-from .example_steps import step__clusters_post3
-from .example_steps import step__clusters_post4
-from .example_steps import step__clusters_post5
-from .example_steps import step__clusters_post6
-from .example_steps import step__clusters_post_kustoclustersstart
-from .example_steps import step__clusters_post_kustoclustersstop
-from .example_steps import step__clusterprincipalassignments_put
-from .example_steps import step__clusterprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_put
-from .example_steps import step__databaseprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_delete
-from .example_steps import step__databases_put_kustodatabasescreateorupdate
-from .example_steps import step__databases_get_kustodatabasesget
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__databases_patch_kustodatabasesupdate
-from .example_steps import step__databases_post_kustodatabaseaddprincipals
-from .example_steps import step__databases_post_kustodatabaselistprincipals
-from .example_steps import step__databases_post_kustodatabaseremoveprincipals
-from .example_steps import step__databases_delete_kustodatabasesdelete
-from .example_steps import step__dataconnections_put
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__dataconnections_get_kustodataconnectionsget
-from .example_steps import step__dataconnections_patch
-from .example_steps import step__dataconnections_post
-from .example_steps import step__dataconnections_delete
-from .example_steps import step__clusters_delete_kustoclustersdelete
-from .example_steps import step__attacheddatabaseconfigurations_delete
-from .example_steps import step__clusterprincipalassignments_delete
+from .example_steps import step_attached_database_configuration_create
+from .example_steps import step_attached_database_configuration_show
+from .example_steps import step_attached_database_configuration_list
+from .example_steps import step_cluster_create
+from .example_steps import step_cluster_show
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_update
+from .example_steps import step_cluster_add_language_extension
+from .example_steps import step_cluster_detach_follower_database
+from .example_steps import step_cluster_diagnose_virtual_network
+from .example_steps import step_cluster_list_follower_database
+from .example_steps import step_cluster_list_language_extension
+from .example_steps import step_cluster_remove_language_extension
+from .example_steps import step_cluster_start
+from .example_steps import step_cluster_stop
+from .example_steps import step_cluster_principal_assignment_create
+from .example_steps import step_cluster_principal_assignment_show
+from .example_steps import step_cluster_principal_assignment_list
+from .example_steps import step_database_principal_assignment_create
+from .example_steps import step_database_principal_assignment_show
+from .example_steps import step_database_principal_assignment_list
+from .example_steps import step_database_principal_assignment_delete
+from .example_steps import step_database_create
+from .example_steps import step_database_show
+from .example_steps import step_database_list
+from .example_steps import step_database_update
+from .example_steps import step_database_add_principal
+from .example_steps import step_database_list_principal
+from .example_steps import step_database_remove_principal
+from .example_steps import step_database_delete
+from .example_steps import step_data_connection_create
+from .example_steps import step_data_connection_list
+from .example_steps import step_data_connection_show
+from .example_steps import step_data_connection_update
+from .example_steps import step_data_connection_data_connection_validation
+from .example_steps import step_data_connection_delete
+from .example_steps import step_cluster_delete
+from .example_steps import step_attached_database_configuration_delete
+from .example_steps import step_cluster_principal_assignment_delete
 from .. import (
     try_manual,
     raise_if,
@@ -79,20 +79,20 @@ def cleanup_scenario(test, rg):
 @try_manual
 def call_scenario(test, rg):
     setup_scenario(test, rg)
-    step__attacheddatabaseconfigurations_put(test, rg, checks=[
+    step_attached_database_configuration_create(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("clusterResourceId", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Kusto"
                    "/Clusters/{myCluster3}", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get(test, rg, checks=[
+    step_attached_database_configuration_show(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get2(test, rg, checks=[
+    step_attached_database_configuration_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=[
+    step_cluster_create(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -103,7 +103,7 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclustersget(test, rg, checks=[
+    step_cluster_show(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -112,15 +112,15 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclusterslist(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=[])
-    step__clusters_get_kustoclusterslistskus(test, rg, checks=[])
-    step__clusters_patch_kustoclustersupdate(test, rg, checks=[
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_update(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -133,49 +133,49 @@ def call_scenario(test, rg):
         test.check("keyVaultProperties.keyVaultUri", "https://dummy.keyvault.com", case_sensitive=False),
         test.check("keyVaultProperties.keyVersion", "keyVersion", case_sensitive=False),
     ])
-    step__clusters_post(test, rg, checks=[])
-    step__clusters_post2(test, rg, checks=[])
-    step__clusters_post3(test, rg, checks=[])
-    step__clusters_post4(test, rg, checks=[])
-    step__clusters_post5(test, rg, checks=[])
-    step__clusters_post6(test, rg, checks=[])
-    step__clusters_post_kustoclustersstart(test, rg, checks=[])
-    step__clusters_post_kustoclustersstop(test, rg, checks=[])
-    step__clusterprincipalassignments_put(test, rg, checks=[])
-    step__clusterprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_put(test, rg, checks=[])
-    step__databaseprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_delete(test, rg, checks=[])
-    step__databases_put_kustodatabasescreateorupdate(test, rg, checks=[])
-    step__databases_get_kustodatabasesget(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[])
-    step__databases_patch_kustodatabasesupdate(test, rg, checks=[])
-    step__databases_post_kustodatabaseaddprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaselistprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=[])
-    step__databases_delete_kustodatabasesdelete(test, rg, checks=[])
-    step__dataconnections_put(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[
+    step_cluster_add_language_extension(test, rg, checks=[])
+    step_cluster_detach_follower_database(test, rg, checks=[])
+    step_cluster_diagnose_virtual_network(test, rg, checks=[])
+    step_cluster_list_follower_database(test, rg, checks=[])
+    step_cluster_list_language_extension(test, rg, checks=[])
+    step_cluster_remove_language_extension(test, rg, checks=[])
+    step_cluster_start(test, rg, checks=[])
+    step_cluster_stop(test, rg, checks=[])
+    step_cluster_principal_assignment_create(test, rg, checks=[])
+    step_cluster_principal_assignment_show(test, rg, checks=[])
+    step_cluster_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_create(test, rg, checks=[])
+    step_database_principal_assignment_show(test, rg, checks=[])
+    step_database_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_delete(test, rg, checks=[])
+    step_database_create(test, rg, checks=[])
+    step_database_show(test, rg, checks=[])
+    step_database_list(test, rg, checks=[])
+    step_database_update(test, rg, checks=[])
+    step_database_add_principal(test, rg, checks=[])
+    step_database_list_principal(test, rg, checks=[])
+    step_database_remove_principal(test, rg, checks=[])
+    step_database_delete(test, rg, checks=[])
+    step_data_connection_create(test, rg, checks=[])
+    step_data_connection_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__dataconnections_get_kustodataconnectionsget(test, rg, checks=[])
-    step__dataconnections_patch(test, rg, checks=[])
-    step__dataconnections_post(test, rg, checks=[])
-    step__dataconnections_delete(test, rg, checks=[])
-    step__clusters_delete_kustoclustersdelete(test, rg, checks=[])
-    step__attacheddatabaseconfigurations_delete(test, rg, checks=[])
-    step__clusterprincipalassignments_delete(test, rg, checks=[])
+    step_data_connection_show(test, rg, checks=[])
+    step_data_connection_update(test, rg, checks=[])
+    step_data_connection_data_connection_validation(test, rg, checks=[])
+    step_data_connection_delete(test, rg, checks=[])
+    step_cluster_delete(test, rg, checks=[])
+    step_attached_database_configuration_delete(test, rg, checks=[])
+    step_cluster_principal_assignment_delete(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class KustoScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestkusto_kustorptest'[:7], key='rg', parameter_name='rg')
-    def test_kusto(self, rg):
+    def test_kusto_Scenario(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_params.py

@@ -175,8 +175,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -192,8 +192,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
         c.argument('principal_id', type=str, help='The principal ID assigned to the cluster principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['AllDatabasesAdmin', 'AllDatabasesViewer']), help='Cluster '
@@ -204,14 +204,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -220,8 +220,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -235,8 +235,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('read_write_database', action=AddReadWriteDatabase, nargs='*', help='Class representing a read '
                    'write database.', arg_group='Parameters')
         c.argument('read_only_following_database', action=AddReadOnlyFollowingDatabase, nargs='*', help='Class '
@@ -245,14 +245,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto database delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database add-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database list-principal') as c:
@@ -263,15 +263,15 @@ def load_arguments(self, _):
     with self.argument_context('kusto database remove-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database-principal-assignment list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -281,10 +281,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -301,10 +301,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
         c.argument('principal_id', type=str, help='The principal ID assigned to the database principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['Admin', 'Ingestor', 'Monitor', 'User', 'UnrestrictedViewers',
@@ -315,18 +315,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto attached-database-configuration list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -351,8 +351,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration update') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -366,8 +366,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -391,17 +391,17 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection event-grid create') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -427,8 +427,8 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -450,8 +450,8 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -471,10 +471,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-grid update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -499,10 +499,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -523,10 +523,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection iot-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -546,18 +546,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection event-grid data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -582,10 +582,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-hub data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -606,10 +606,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection iot-hub data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -629,7 +629,7 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')

src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /AttachedDatabaseConfigurations/put/AttachedDatabaseConfigurationsCreateOrUpdate
 @try_manual
-def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
+def step_attached_database_configuration_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration create '
@@ -35,7 +35,7 @@ def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/AttachedDatabaseConfigurationsGet
 @try_manual
-def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
+def step_attached_database_configuration_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration show '
@@ -47,7 +47,7 @@ def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/KustoAttachedDatabaseConfigurationsListByCluster
 @try_manual
-def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
+def step_attached_database_configuration_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration list '
@@ -58,7 +58,7 @@ def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/put/KustoClustersCreateOrUpdate
 @try_manual
-def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
+def step_cluster_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster create '
@@ -79,7 +79,7 @@ def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersGet
 @try_manual
-def step__clusters_get_kustoclustersget(test, rg, checks=None):
+def step_cluster_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster show '
@@ -90,7 +90,7 @@ def step__clusters_get_kustoclustersget(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersList
 @try_manual
-def step__clusters_get_kustoclusterslist(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -100,7 +100,7 @@ def step__clusters_get_kustoclusterslist(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListByResourceGroup
 @try_manual
-def step__clusters_get(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -110,7 +110,7 @@ def step__clusters_get(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListResourceSkus
 @try_manual
-def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -121,7 +121,7 @@ def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListSkus
 @try_manual
-def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -131,7 +131,7 @@ def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/patch/KustoClustersUpdate
 @try_manual
-def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
+def step_cluster_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster update '
@@ -148,7 +148,7 @@ def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterAddLanguageExtensions
 @try_manual
-def step__clusters_post(test, rg, checks=None):
+def step_cluster_add_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster add-language-extension '
@@ -161,7 +161,7 @@ def step__clusters_post(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDetachFollowerDatabases
 @try_manual
-def step__clusters_post2(test, rg, checks=None):
+def step_cluster_detach_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster detach-follower-database '
@@ -175,7 +175,7 @@ def step__clusters_post2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDiagnoseVirtualNetwork
 @try_manual
-def step__clusters_post3(test, rg, checks=None):
+def step_cluster_diagnose_virtual_network(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster diagnose-virtual-network '
@@ -186,7 +186,7 @@ def step__clusters_post3(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListFollowerDatabases
 @try_manual
-def step__clusters_post4(test, rg, checks=None):
+def step_cluster_list_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-follower-database '
@@ -197,7 +197,7 @@ def step__clusters_post4(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListLanguageExtensions
 @try_manual
-def step__clusters_post5(test, rg, checks=None):
+def step_cluster_list_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-language-extension '
@@ -208,7 +208,7 @@ def step__clusters_post5(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterRemoveLanguageExtensions
 @try_manual
-def step__clusters_post6(test, rg, checks=None):
+def step_cluster_remove_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster remove-language-extension '
@@ -221,7 +221,7 @@ def step__clusters_post6(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStart
 @try_manual
-def step__clusters_post_kustoclustersstart(test, rg, checks=None):
+def step_cluster_start(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster start '
@@ -232,7 +232,7 @@ def step__clusters_post_kustoclustersstart(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStop
 @try_manual
-def step__clusters_post_kustoclustersstop(test, rg, checks=None):
+def step_cluster_stop(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster stop '
@@ -243,7 +243,7 @@ def step__clusters_post_kustoclustersstop(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/put/KustoClusterPrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__clusterprincipalassignments_put(test, rg, checks=None):
+def step_cluster_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment create '
@@ -259,7 +259,7 @@ def step__clusterprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoClusterPrincipalAssignmentsGet
 @try_manual
-def step__clusterprincipalassignments_get(test, rg, checks=None):
+def step_cluster_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment show '
@@ -271,7 +271,7 @@ def step__clusterprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_cluster_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment list '
@@ -282,7 +282,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/put/KustoDatabasePrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__databaseprincipalassignments_put(test, rg, checks=None):
+def step_database_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment create '
@@ -299,7 +299,7 @@ def step__databaseprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoDatabasePrincipalAssignmentsGet
 @try_manual
-def step__databaseprincipalassignments_get(test, rg, checks=None):
+def step_database_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment show '
@@ -312,7 +312,7 @@ def step__databaseprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_database_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment list '
@@ -324,7 +324,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/delete/KustoDatabasePrincipalAssignmentsDelete
 @try_manual
-def step__databaseprincipalassignments_delete(test, rg, checks=None):
+def step_database_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment delete -y '
@@ -337,7 +337,7 @@ def step__databaseprincipalassignments_delete(test, rg, checks=None):
 
 # EXAMPLE: /Databases/put/KustoDatabasesCreateOrUpdate
 @try_manual
-def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
+def step_database_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database create '
@@ -350,7 +350,7 @@ def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesGet
 @try_manual
-def step__databases_get_kustodatabasesget(test, rg, checks=None):
+def step_database_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database show '
@@ -362,7 +362,7 @@ def step__databases_get_kustodatabasesget(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_database_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list '
@@ -373,7 +373,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /Databases/patch/KustoDatabasesUpdate
 @try_manual
-def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
+def step_database_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database update '
@@ -386,7 +386,7 @@ def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseAddPrincipals
 @try_manual
-def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
+def step_database_add_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database add-principal '
@@ -401,7 +401,7 @@ def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseListPrincipals
 @try_manual
-def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
+def step_database_list_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list-principal '
@@ -413,7 +413,7 @@ def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseRemovePrincipals
 @try_manual
-def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
+def step_database_remove_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database remove-principal '
@@ -428,7 +428,7 @@ def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/delete/KustoDatabasesDelete
 @try_manual
-def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
+def step_database_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database delete -y '
@@ -440,7 +440,7 @@ def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/put/KustoDataConnectionsCreateOrUpdate
 @try_manual
-def step__dataconnections_put(test, rg, checks=None):
+def step_data_connection_event_hub_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub create '
@@ -457,7 +457,7 @@ def step__dataconnections_put(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_data_connection_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection list '
@@ -469,7 +469,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDataConnectionsGet
 @try_manual
-def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
+def step_data_connection_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection show '
@@ -482,7 +482,7 @@ def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/patch/KustoDataConnectionsUpdate
 @try_manual
-def step__dataconnections_patch(test, rg, checks=None):
+def step_data_connection_event_hub_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub update '
@@ -499,7 +499,7 @@ def step__dataconnections_patch(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/post/KustoDataConnectionValidation
 @try_manual
-def step__dataconnections_post(test, rg, checks=None):
+def step_data_connection_event(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub data-connection-validation '
@@ -515,7 +515,7 @@ def step__dataconnections_post(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/delete/KustoDataConnectionsDelete
 @try_manual
-def step__dataconnections_delete(test, rg, checks=None):
+def step_data_connection_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection delete -y '
@@ -528,7 +528,7 @@ def step__dataconnections_delete(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/delete/KustoClustersDelete
 @try_manual
-def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
+def step_cluster_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster delete -y '
@@ -539,7 +539,7 @@ def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/delete/AttachedDatabaseConfigurationsDelete
 @try_manual
-def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
+def step_attached_database_configuration_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration delete -y '
@@ -551,7 +551,7 @@ def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/delete/KustoClusterPrincipalAssignmentsDelete
 @try_manual
-def step__clusterprincipalassignments_delete(test, rg, checks=None):
+def step_cluster_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment delete -y '

src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py

@@ -11,48 +11,48 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step__attacheddatabaseconfigurations_put
-from .example_steps import step__attacheddatabaseconfigurations_get
-from .example_steps import step__attacheddatabaseconfigurations_get2
-from .example_steps import step__clusters_put_kustoclusterscreateorupdate
-from .example_steps import step__clusters_get_kustoclustersget
-from .example_steps import step__clusters_get_kustoclusterslist
-from .example_steps import step__clusters_get
-from .example_steps import step__clusters_get_kustoclusterslistresourceskus
-from .example_steps import step__clusters_get_kustoclusterslistskus
-from .example_steps import step__clusters_patch_kustoclustersupdate
-from .example_steps import step__clusters_post
-from .example_steps import step__clusters_post2
-from .example_steps import step__clusters_post3
-from .example_steps import step__clusters_post4
-from .example_steps import step__clusters_post5
-from .example_steps import step__clusters_post6
-from .example_steps import step__clusters_post_kustoclustersstart
-from .example_steps import step__clusters_post_kustoclustersstop
-from .example_steps import step__clusterprincipalassignments_put
-from .example_steps import step__clusterprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_put
-from .example_steps import step__databaseprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_delete
-from .example_steps import step__databases_put_kustodatabasescreateorupdate
-from .example_steps import step__databases_get_kustodatabasesget
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__databases_patch_kustodatabasesupdate
-from .example_steps import step__databases_post_kustodatabaseaddprincipals
-from .example_steps import step__databases_post_kustodatabaselistprincipals
-from .example_steps import step__databases_post_kustodatabaseremoveprincipals
-from .example_steps import step__databases_delete_kustodatabasesdelete
-from .example_steps import step__dataconnections_put
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__dataconnections_get_kustodataconnectionsget
-from .example_steps import step__dataconnections_patch
-from .example_steps import step__dataconnections_post
-from .example_steps import step__dataconnections_delete
-from .example_steps import step__clusters_delete_kustoclustersdelete
-from .example_steps import step__attacheddatabaseconfigurations_delete
-from .example_steps import step__clusterprincipalassignments_delete
+from .example_steps import step_attached_database_configuration_create
+from .example_steps import step_attached_database_configuration_show
+from .example_steps import step_attached_database_configuration_list
+from .example_steps import step_cluster_create
+from .example_steps import step_cluster_show
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_update
+from .example_steps import step_cluster_add_language_extension
+from .example_steps import step_cluster_detach_follower_database
+from .example_steps import step_cluster_diagnose_virtual_network
+from .example_steps import step_cluster_list_follower_database
+from .example_steps import step_cluster_list_language_extension
+from .example_steps import step_cluster_remove_language_extension
+from .example_steps import step_cluster_start
+from .example_steps import step_cluster_stop
+from .example_steps import step_cluster_principal_assignment_create
+from .example_steps import step_cluster_principal_assignment_show
+from .example_steps import step_cluster_principal_assignment_list
+from .example_steps import step_database_principal_assignment_create
+from .example_steps import step_database_principal_assignment_show
+from .example_steps import step_database_principal_assignment_list
+from .example_steps import step_database_principal_assignment_delete
+from .example_steps import step_database_create
+from .example_steps import step_database_show
+from .example_steps import step_database_list
+from .example_steps import step_database_update
+from .example_steps import step_database_add_principal
+from .example_steps import step_database_list_principal
+from .example_steps import step_database_remove_principal
+from .example_steps import step_database_delete
+from .example_steps import step_data_connection_event_hub_create
+from .example_steps import step_data_connection_list
+from .example_steps import step_data_connection_show
+from .example_steps import step_data_connection_event_hub_update
+from .example_steps import step_data_connection_event
+from .example_steps import step_data_connection_delete
+from .example_steps import step_cluster_delete
+from .example_steps import step_attached_database_configuration_delete
+from .example_steps import step_cluster_principal_assignment_delete
 from .. import (
     try_manual,
     raise_if,
@@ -79,20 +79,20 @@ def cleanup_scenario(test, rg):
 @try_manual
 def call_scenario(test, rg):
     setup_scenario(test, rg)
-    step__attacheddatabaseconfigurations_put(test, rg, checks=[
+    step_attached_database_configuration_create(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("clusterResourceId", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Kusto"
                    "/Clusters/{myCluster3}", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get(test, rg, checks=[
+    step_attached_database_configuration_show(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get2(test, rg, checks=[
+    step_attached_database_configuration_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=[
+    step_cluster_create(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -103,7 +103,7 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclustersget(test, rg, checks=[
+    step_cluster_show(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -112,15 +112,15 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclusterslist(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=[])
-    step__clusters_get_kustoclusterslistskus(test, rg, checks=[])
-    step__clusters_patch_kustoclustersupdate(test, rg, checks=[
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_update(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -133,54 +133,54 @@ def call_scenario(test, rg):
         test.check("keyVaultProperties.keyVaultUri", "https://dummy.keyvault.com", case_sensitive=False),
         test.check("keyVaultProperties.keyVersion", "keyVersion", case_sensitive=False),
     ])
-    step__clusters_post(test, rg, checks=[])
-    step__clusters_post2(test, rg, checks=[])
-    step__clusters_post3(test, rg, checks=[])
-    step__clusters_post4(test, rg, checks=[])
-    step__clusters_post5(test, rg, checks=[])
-    step__clusters_post6(test, rg, checks=[])
-    step__clusters_post_kustoclustersstart(test, rg, checks=[])
-    step__clusters_post_kustoclustersstop(test, rg, checks=[])
-    step__clusterprincipalassignments_put(test, rg, checks=[])
-    step__clusterprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_put(test, rg, checks=[])
-    step__databaseprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_delete(test, rg, checks=[])
-    step__databases_put_kustodatabasescreateorupdate(test, rg, checks=[])
-    step__databases_get_kustodatabasesget(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[])
-    step__databases_patch_kustodatabasesupdate(test, rg, checks=[])
-    step__databases_post_kustodatabaseaddprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaselistprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=[])
-    step__databases_delete_kustodatabasesdelete(test, rg, checks=[])
-    step__dataconnections_put(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[
+    step_cluster_add_language_extension(test, rg, checks=[])
+    step_cluster_detach_follower_database(test, rg, checks=[])
+    step_cluster_diagnose_virtual_network(test, rg, checks=[])
+    step_cluster_list_follower_database(test, rg, checks=[])
+    step_cluster_list_language_extension(test, rg, checks=[])
+    step_cluster_remove_language_extension(test, rg, checks=[])
+    step_cluster_start(test, rg, checks=[])
+    step_cluster_stop(test, rg, checks=[])
+    step_cluster_principal_assignment_create(test, rg, checks=[])
+    step_cluster_principal_assignment_show(test, rg, checks=[])
+    step_cluster_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_create(test, rg, checks=[])
+    step_database_principal_assignment_show(test, rg, checks=[])
+    step_database_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_delete(test, rg, checks=[])
+    step_database_create(test, rg, checks=[])
+    step_database_show(test, rg, checks=[])
+    step_database_list(test, rg, checks=[])
+    step_database_update(test, rg, checks=[])
+    step_database_add_principal(test, rg, checks=[])
+    step_database_list_principal(test, rg, checks=[])
+    step_database_remove_principal(test, rg, checks=[])
+    step_database_delete(test, rg, checks=[])
+    step_data_connection_event_hub_create(test, rg, checks=[])
+    step_data_connection_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__dataconnections_get_kustodataconnectionsget(test, rg, checks=[
+    step_data_connection_show(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("consumerGroup", "testConsumerGroup1", case_sensitive=False),
         test.check("eventHubResourceId", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Even"
                    "tHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1", case_sensitive=False),
     ])
-    step__dataconnections_patch(test, rg, checks=[])
-    step__dataconnections_post(test, rg, checks=[])
-    step__dataconnections_delete(test, rg, checks=[])
-    step__clusters_delete_kustoclustersdelete(test, rg, checks=[])
-    step__attacheddatabaseconfigurations_delete(test, rg, checks=[])
-    step__clusterprincipalassignments_delete(test, rg, checks=[])
+    step_data_connection_event_hub_update(test, rg, checks=[])
+    step_data_connection_event(test, rg, checks=[])
+    step_data_connection_delete(test, rg, checks=[])
+    step_cluster_delete(test, rg, checks=[])
+    step_attached_database_configuration_delete(test, rg, checks=[])
+    step_cluster_principal_assignment_delete(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class KustoScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestkusto_kustorptest'[:7], key='rg', parameter_name='rg')
-    def test_kusto(self, rg):
+    def test_kusto_Scenario(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/kusto/output/extnosdk/src/kusto/azext_kusto/generated/_params.py

@@ -175,8 +175,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -192,8 +192,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
         c.argument('principal_id', type=str, help='The principal ID assigned to the cluster principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['AllDatabasesAdmin', 'AllDatabasesViewer']), help='Cluster '
@@ -204,14 +204,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -220,8 +220,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -235,8 +235,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('read_write_database', action=AddReadWriteDatabase, nargs='*', help='Class representing a read '
                    'write database.', arg_group='Parameters')
         c.argument('read_only_following_database', action=AddReadOnlyFollowingDatabase, nargs='*', help='Class '
@@ -245,14 +245,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto database delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database add-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database list-principal') as c:
@@ -263,15 +263,15 @@ def load_arguments(self, _):
     with self.argument_context('kusto database remove-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database-principal-assignment list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -281,10 +281,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -301,10 +301,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
         c.argument('principal_id', type=str, help='The principal ID assigned to the database principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['Admin', 'Ingestor', 'Monitor', 'User', 'UnrestrictedViewers',
@@ -315,18 +315,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto attached-database-configuration list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -351,8 +351,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration update') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -366,8 +366,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -391,17 +391,17 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection event-grid create') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -427,8 +427,8 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -450,8 +450,8 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -471,10 +471,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-grid update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -499,10 +499,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -523,10 +523,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection iot-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -546,18 +546,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection event-grid data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -582,10 +582,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-hub data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -606,10 +606,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection iot-hub data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -629,7 +629,7 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')

src/test/scenarios/kusto/output/extnosdk/src/kusto/azext_kusto/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /AttachedDatabaseConfigurations/put/AttachedDatabaseConfigurationsCreateOrUpdate
 @try_manual
-def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
+def step_attached_database_configuration_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration create '
@@ -35,7 +35,7 @@ def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/AttachedDatabaseConfigurationsGet
 @try_manual
-def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
+def step_attached_database_configuration_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration show '
@@ -47,7 +47,7 @@ def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/KustoAttachedDatabaseConfigurationsListByCluster
 @try_manual
-def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
+def step_attached_database_configuration_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration list '
@@ -58,7 +58,7 @@ def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/put/KustoClustersCreateOrUpdate
 @try_manual
-def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
+def step_cluster_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster create '
@@ -79,7 +79,7 @@ def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersGet
 @try_manual
-def step__clusters_get_kustoclustersget(test, rg, checks=None):
+def step_cluster_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster show '
@@ -90,7 +90,7 @@ def step__clusters_get_kustoclustersget(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersList
 @try_manual
-def step__clusters_get_kustoclusterslist(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -100,7 +100,7 @@ def step__clusters_get_kustoclusterslist(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListByResourceGroup
 @try_manual
-def step__clusters_get(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -110,7 +110,7 @@ def step__clusters_get(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListResourceSkus
 @try_manual
-def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -121,7 +121,7 @@ def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListSkus
 @try_manual
-def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -131,7 +131,7 @@ def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/patch/KustoClustersUpdate
 @try_manual
-def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
+def step_cluster_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster update '
@@ -148,7 +148,7 @@ def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterAddLanguageExtensions
 @try_manual
-def step__clusters_post(test, rg, checks=None):
+def step_cluster_add_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster add-language-extension '
@@ -161,7 +161,7 @@ def step__clusters_post(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDetachFollowerDatabases
 @try_manual
-def step__clusters_post2(test, rg, checks=None):
+def step_cluster_detach_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster detach-follower-database '
@@ -175,7 +175,7 @@ def step__clusters_post2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDiagnoseVirtualNetwork
 @try_manual
-def step__clusters_post3(test, rg, checks=None):
+def step_cluster_diagnose_virtual_network(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster diagnose-virtual-network '
@@ -186,7 +186,7 @@ def step__clusters_post3(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListFollowerDatabases
 @try_manual
-def step__clusters_post4(test, rg, checks=None):
+def step_cluster_list_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-follower-database '
@@ -197,7 +197,7 @@ def step__clusters_post4(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListLanguageExtensions
 @try_manual
-def step__clusters_post5(test, rg, checks=None):
+def step_cluster_list_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-language-extension '
@@ -208,7 +208,7 @@ def step__clusters_post5(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterRemoveLanguageExtensions
 @try_manual
-def step__clusters_post6(test, rg, checks=None):
+def step_cluster_remove_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster remove-language-extension '
@@ -221,7 +221,7 @@ def step__clusters_post6(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStart
 @try_manual
-def step__clusters_post_kustoclustersstart(test, rg, checks=None):
+def step_cluster_start(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster start '
@@ -232,7 +232,7 @@ def step__clusters_post_kustoclustersstart(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStop
 @try_manual
-def step__clusters_post_kustoclustersstop(test, rg, checks=None):
+def step_cluster_stop(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster stop '
@@ -243,7 +243,7 @@ def step__clusters_post_kustoclustersstop(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/put/KustoClusterPrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__clusterprincipalassignments_put(test, rg, checks=None):
+def step_cluster_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment create '
@@ -259,7 +259,7 @@ def step__clusterprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoClusterPrincipalAssignmentsGet
 @try_manual
-def step__clusterprincipalassignments_get(test, rg, checks=None):
+def step_cluster_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment show '
@@ -271,7 +271,7 @@ def step__clusterprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_cluster_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment list '
@@ -282,7 +282,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/put/KustoDatabasePrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__databaseprincipalassignments_put(test, rg, checks=None):
+def step_database_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment create '
@@ -299,7 +299,7 @@ def step__databaseprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoDatabasePrincipalAssignmentsGet
 @try_manual
-def step__databaseprincipalassignments_get(test, rg, checks=None):
+def step_database_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment show '
@@ -312,7 +312,7 @@ def step__databaseprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_database_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment list '
@@ -324,7 +324,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/delete/KustoDatabasePrincipalAssignmentsDelete
 @try_manual
-def step__databaseprincipalassignments_delete(test, rg, checks=None):
+def step_database_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment delete -y '
@@ -337,7 +337,7 @@ def step__databaseprincipalassignments_delete(test, rg, checks=None):
 
 # EXAMPLE: /Databases/put/KustoDatabasesCreateOrUpdate
 @try_manual
-def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
+def step_database_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database create '
@@ -350,7 +350,7 @@ def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesGet
 @try_manual
-def step__databases_get_kustodatabasesget(test, rg, checks=None):
+def step_database_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database show '
@@ -362,7 +362,7 @@ def step__databases_get_kustodatabasesget(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_database_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list '
@@ -373,7 +373,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /Databases/patch/KustoDatabasesUpdate
 @try_manual
-def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
+def step_database_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database update '
@@ -386,7 +386,7 @@ def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseAddPrincipals
 @try_manual
-def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
+def step_database_add_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database add-principal '
@@ -401,7 +401,7 @@ def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseListPrincipals
 @try_manual
-def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
+def step_database_list_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list-principal '
@@ -413,7 +413,7 @@ def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseRemovePrincipals
 @try_manual
-def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
+def step_database_remove_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database remove-principal '
@@ -428,7 +428,7 @@ def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/delete/KustoDatabasesDelete
 @try_manual
-def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
+def step_database_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database delete -y '
@@ -440,7 +440,7 @@ def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/put/KustoDataConnectionsCreateOrUpdate
 @try_manual
-def step__dataconnections_put(test, rg, checks=None):
+def step_data_connection_event_hub_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub create '
@@ -457,7 +457,7 @@ def step__dataconnections_put(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_data_connection_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection list '
@@ -469,7 +469,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDataConnectionsGet
 @try_manual
-def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
+def step_data_connection_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection show '
@@ -482,7 +482,7 @@ def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/patch/KustoDataConnectionsUpdate
 @try_manual
-def step__dataconnections_patch(test, rg, checks=None):
+def step_data_connection_event_hub_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub update '
@@ -499,7 +499,7 @@ def step__dataconnections_patch(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/post/KustoDataConnectionValidation
 @try_manual
-def step__dataconnections_post(test, rg, checks=None):
+def step_data_connection_event(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub data-connection-validation '
@@ -515,7 +515,7 @@ def step__dataconnections_post(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/delete/KustoDataConnectionsDelete
 @try_manual
-def step__dataconnections_delete(test, rg, checks=None):
+def step_data_connection_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection delete -y '
@@ -528,7 +528,7 @@ def step__dataconnections_delete(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/delete/KustoClustersDelete
 @try_manual
-def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
+def step_cluster_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster delete -y '
@@ -539,7 +539,7 @@ def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/delete/AttachedDatabaseConfigurationsDelete
 @try_manual
-def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
+def step_attached_database_configuration_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration delete -y '
@@ -551,7 +551,7 @@ def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/delete/KustoClusterPrincipalAssignmentsDelete
 @try_manual
-def step__clusterprincipalassignments_delete(test, rg, checks=None):
+def step_cluster_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment delete -y '

src/test/scenarios/kusto/output/extnosdk/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py

@@ -11,48 +11,48 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step__attacheddatabaseconfigurations_put
-from .example_steps import step__attacheddatabaseconfigurations_get
-from .example_steps import step__attacheddatabaseconfigurations_get2
-from .example_steps import step__clusters_put_kustoclusterscreateorupdate
-from .example_steps import step__clusters_get_kustoclustersget
-from .example_steps import step__clusters_get_kustoclusterslist
-from .example_steps import step__clusters_get
-from .example_steps import step__clusters_get_kustoclusterslistresourceskus
-from .example_steps import step__clusters_get_kustoclusterslistskus
-from .example_steps import step__clusters_patch_kustoclustersupdate
-from .example_steps import step__clusters_post
-from .example_steps import step__clusters_post2
-from .example_steps import step__clusters_post3
-from .example_steps import step__clusters_post4
-from .example_steps import step__clusters_post5
-from .example_steps import step__clusters_post6
-from .example_steps import step__clusters_post_kustoclustersstart
-from .example_steps import step__clusters_post_kustoclustersstop
-from .example_steps import step__clusterprincipalassignments_put
-from .example_steps import step__clusterprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_put
-from .example_steps import step__databaseprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_delete
-from .example_steps import step__databases_put_kustodatabasescreateorupdate
-from .example_steps import step__databases_get_kustodatabasesget
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__databases_patch_kustodatabasesupdate
-from .example_steps import step__databases_post_kustodatabaseaddprincipals
-from .example_steps import step__databases_post_kustodatabaselistprincipals
-from .example_steps import step__databases_post_kustodatabaseremoveprincipals
-from .example_steps import step__databases_delete_kustodatabasesdelete
-from .example_steps import step__dataconnections_put
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__dataconnections_get_kustodataconnectionsget
-from .example_steps import step__dataconnections_patch
-from .example_steps import step__dataconnections_post
-from .example_steps import step__dataconnections_delete
-from .example_steps import step__clusters_delete_kustoclustersdelete
-from .example_steps import step__attacheddatabaseconfigurations_delete
-from .example_steps import step__clusterprincipalassignments_delete
+from .example_steps import step_attached_database_configuration_create
+from .example_steps import step_attached_database_configuration_show
+from .example_steps import step_attached_database_configuration_list
+from .example_steps import step_cluster_create
+from .example_steps import step_cluster_show
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_update
+from .example_steps import step_cluster_add_language_extension
+from .example_steps import step_cluster_detach_follower_database
+from .example_steps import step_cluster_diagnose_virtual_network
+from .example_steps import step_cluster_list_follower_database
+from .example_steps import step_cluster_list_language_extension
+from .example_steps import step_cluster_remove_language_extension
+from .example_steps import step_cluster_start
+from .example_steps import step_cluster_stop
+from .example_steps import step_cluster_principal_assignment_create
+from .example_steps import step_cluster_principal_assignment_show
+from .example_steps import step_cluster_principal_assignment_list
+from .example_steps import step_database_principal_assignment_create
+from .example_steps import step_database_principal_assignment_show
+from .example_steps import step_database_principal_assignment_list
+from .example_steps import step_database_principal_assignment_delete
+from .example_steps import step_database_create
+from .example_steps import step_database_show
+from .example_steps import step_database_list
+from .example_steps import step_database_update
+from .example_steps import step_database_add_principal
+from .example_steps import step_database_list_principal
+from .example_steps import step_database_remove_principal
+from .example_steps import step_database_delete
+from .example_steps import step_data_connection_event_hub_create
+from .example_steps import step_data_connection_list
+from .example_steps import step_data_connection_show
+from .example_steps import step_data_connection_event_hub_update
+from .example_steps import step_data_connection_event
+from .example_steps import step_data_connection_delete
+from .example_steps import step_cluster_delete
+from .example_steps import step_attached_database_configuration_delete
+from .example_steps import step_cluster_principal_assignment_delete
 from .. import (
     try_manual,
     raise_if,
@@ -79,20 +79,20 @@ def cleanup_scenario(test, rg):
 @try_manual
 def call_scenario(test, rg):
     setup_scenario(test, rg)
-    step__attacheddatabaseconfigurations_put(test, rg, checks=[
+    step_attached_database_configuration_create(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("clusterResourceId", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Kusto"
                    "/Clusters/{myCluster3}", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get(test, rg, checks=[
+    step_attached_database_configuration_show(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get2(test, rg, checks=[
+    step_attached_database_configuration_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=[
+    step_cluster_create(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -103,7 +103,7 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclustersget(test, rg, checks=[
+    step_cluster_show(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -112,15 +112,15 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclusterslist(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=[])
-    step__clusters_get_kustoclusterslistskus(test, rg, checks=[])
-    step__clusters_patch_kustoclustersupdate(test, rg, checks=[
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_update(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -133,54 +133,54 @@ def call_scenario(test, rg):
         test.check("keyVaultProperties.keyVaultUri", "https://dummy.keyvault.com", case_sensitive=False),
         test.check("keyVaultProperties.keyVersion", "keyVersion", case_sensitive=False),
     ])
-    step__clusters_post(test, rg, checks=[])
-    step__clusters_post2(test, rg, checks=[])
-    step__clusters_post3(test, rg, checks=[])
-    step__clusters_post4(test, rg, checks=[])
-    step__clusters_post5(test, rg, checks=[])
-    step__clusters_post6(test, rg, checks=[])
-    step__clusters_post_kustoclustersstart(test, rg, checks=[])
-    step__clusters_post_kustoclustersstop(test, rg, checks=[])
-    step__clusterprincipalassignments_put(test, rg, checks=[])
-    step__clusterprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_put(test, rg, checks=[])
-    step__databaseprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_delete(test, rg, checks=[])
-    step__databases_put_kustodatabasescreateorupdate(test, rg, checks=[])
-    step__databases_get_kustodatabasesget(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[])
-    step__databases_patch_kustodatabasesupdate(test, rg, checks=[])
-    step__databases_post_kustodatabaseaddprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaselistprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=[])
-    step__databases_delete_kustodatabasesdelete(test, rg, checks=[])
-    step__dataconnections_put(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[
+    step_cluster_add_language_extension(test, rg, checks=[])
+    step_cluster_detach_follower_database(test, rg, checks=[])
+    step_cluster_diagnose_virtual_network(test, rg, checks=[])
+    step_cluster_list_follower_database(test, rg, checks=[])
+    step_cluster_list_language_extension(test, rg, checks=[])
+    step_cluster_remove_language_extension(test, rg, checks=[])
+    step_cluster_start(test, rg, checks=[])
+    step_cluster_stop(test, rg, checks=[])
+    step_cluster_principal_assignment_create(test, rg, checks=[])
+    step_cluster_principal_assignment_show(test, rg, checks=[])
+    step_cluster_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_create(test, rg, checks=[])
+    step_database_principal_assignment_show(test, rg, checks=[])
+    step_database_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_delete(test, rg, checks=[])
+    step_database_create(test, rg, checks=[])
+    step_database_show(test, rg, checks=[])
+    step_database_list(test, rg, checks=[])
+    step_database_update(test, rg, checks=[])
+    step_database_add_principal(test, rg, checks=[])
+    step_database_list_principal(test, rg, checks=[])
+    step_database_remove_principal(test, rg, checks=[])
+    step_database_delete(test, rg, checks=[])
+    step_data_connection_event_hub_create(test, rg, checks=[])
+    step_data_connection_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__dataconnections_get_kustodataconnectionsget(test, rg, checks=[
+    step_data_connection_show(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("consumerGroup", "testConsumerGroup1", case_sensitive=False),
         test.check("eventHubResourceId", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Even"
                    "tHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1", case_sensitive=False),
     ])
-    step__dataconnections_patch(test, rg, checks=[])
-    step__dataconnections_post(test, rg, checks=[])
-    step__dataconnections_delete(test, rg, checks=[])
-    step__clusters_delete_kustoclustersdelete(test, rg, checks=[])
-    step__attacheddatabaseconfigurations_delete(test, rg, checks=[])
-    step__clusterprincipalassignments_delete(test, rg, checks=[])
+    step_data_connection_event_hub_update(test, rg, checks=[])
+    step_data_connection_event(test, rg, checks=[])
+    step_data_connection_delete(test, rg, checks=[])
+    step_cluster_delete(test, rg, checks=[])
+    step_attached_database_configuration_delete(test, rg, checks=[])
+    step_cluster_principal_assignment_delete(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class KustoScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestkusto_kustorptest'[:7], key='rg', parameter_name='rg')
-    def test_kusto(self, rg):
+    def test_kusto_Scenario(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/kusto/output/extnosdknoflattentrack1/src/kusto/azext_kusto/generated/_params.py

@@ -175,8 +175,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -192,8 +192,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
         c.argument('principal_id', type=str, help='The principal ID assigned to the cluster principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['AllDatabasesAdmin', 'AllDatabasesViewer']), help='Cluster '
@@ -204,14 +204,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto cluster-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto cluster-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -220,8 +220,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -235,8 +235,8 @@ def load_arguments(self, _):
     with self.argument_context('kusto database update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('read_write_database', action=AddReadWriteDatabase, nargs='*', help='Class representing a read '
                    'write database.', arg_group='Parameters')
         c.argument('read_only_following_database', action=AddReadOnlyFollowingDatabase, nargs='*', help='Class '
@@ -245,14 +245,14 @@ def load_arguments(self, _):
     with self.argument_context('kusto database delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database add-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database list-principal') as c:
@@ -263,15 +263,15 @@ def load_arguments(self, _):
     with self.argument_context('kusto database remove-principal') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
         c.argument('value', action=AddDatabasesValue, nargs='*', help='The list of Kusto database principals.')
 
     with self.argument_context('kusto database wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
 
     with self.argument_context('kusto database-principal-assignment list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -281,10 +281,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -301,10 +301,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
         c.argument('principal_id', type=str, help='The principal ID assigned to the database principal. It can be a '
                    'user email, application ID, or security group name.')
         c.argument('role', arg_type=get_enum_type(['Admin', 'Ingestor', 'Monitor', 'User', 'UnrestrictedViewers',
@@ -315,18 +315,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto database-principal-assignment delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto database-principal-assignment wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.', id_part=''
-                   'child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('principal_assignment_name', type=str, help='The name of the Kusto principalAssignment.',
+                   id_part='child_name_2')
 
     with self.argument_context('kusto attached-database-configuration list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -351,8 +351,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration update') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -366,8 +366,8 @@ def load_arguments(self, _):
                    'you want to follow all current and future databases.')
         c.argument('cluster_resource_id', type=str, help='The resource id of the cluster where the databases you would '
                    'like to attach reside.')
-        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']), help=''
-                   'The default principals modification kind')
+        c.argument('default_principals_modification_kind', arg_type=get_enum_type(['Union', 'Replace', 'None']),
+                   help='The default principals modification kind')
 
     with self.argument_context('kusto attached-database-configuration delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -391,17 +391,17 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection event-grid create') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -427,8 +427,8 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -450,8 +450,8 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.')
         c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -471,10 +471,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-grid update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -499,10 +499,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -523,10 +523,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection iot-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -546,18 +546,18 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')
 
     with self.argument_context('kusto data-connection event-grid data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('storage_account_resource_id', type=str, help='The resource ID of the storage account where the '
@@ -582,10 +582,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection event-hub data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('event_hub_resource_id', type=str, help='The resource ID of the event hub to be used to create a '
@@ -606,10 +606,10 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection iot-hub data-connection-validation') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('iot_hub_resource_id', type=str, help='The resource ID of the Iot hub to be used to create a data '
@@ -629,7 +629,7 @@ def load_arguments(self, _):
     with self.argument_context('kusto data-connection wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', type=str, help='The name of the Kusto cluster.', id_part='name')
-        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.', id_part=''
-                   'child_name_1')
-        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str, help=''
-                   'The name of the data connection.', id_part='child_name_2')
+        c.argument('database_name', type=str, help='The name of the database in the Kusto cluster.',
+                   id_part='child_name_1')
+        c.argument('data_connection_name', options_list=['--name', '-n', '--data-connection-name'], type=str,
+                   help='The name of the data connection.', id_part='child_name_2')

src/test/scenarios/kusto/output/extnosdknoflattentrack1/src/kusto/azext_kusto/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /AttachedDatabaseConfigurations/put/AttachedDatabaseConfigurationsCreateOrUpdate
 @try_manual
-def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
+def step_attached_database_configuration_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration create '
@@ -35,7 +35,7 @@ def step__attacheddatabaseconfigurations_put(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/AttachedDatabaseConfigurationsGet
 @try_manual
-def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
+def step_attached_database_configuration_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration show '
@@ -47,7 +47,7 @@ def step__attacheddatabaseconfigurations_get(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/get/KustoAttachedDatabaseConfigurationsListByCluster
 @try_manual
-def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
+def step_attached_database_configuration_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration list '
@@ -58,7 +58,7 @@ def step__attacheddatabaseconfigurations_get2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/put/KustoClustersCreateOrUpdate
 @try_manual
-def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
+def step_cluster_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster create '
@@ -79,7 +79,7 @@ def step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersGet
 @try_manual
-def step__clusters_get_kustoclustersget(test, rg, checks=None):
+def step_cluster_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster show '
@@ -90,7 +90,7 @@ def step__clusters_get_kustoclustersget(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersList
 @try_manual
-def step__clusters_get_kustoclusterslist(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -100,7 +100,7 @@ def step__clusters_get_kustoclusterslist(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListByResourceGroup
 @try_manual
-def step__clusters_get(test, rg, checks=None):
+def step_cluster_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list '
@@ -110,7 +110,7 @@ def step__clusters_get(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListResourceSkus
 @try_manual
-def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -121,7 +121,7 @@ def step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/get/KustoClustersListSkus
 @try_manual
-def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
+def step_cluster_list_sku(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-sku '
@@ -131,7 +131,7 @@ def step__clusters_get_kustoclusterslistskus(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/patch/KustoClustersUpdate
 @try_manual
-def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
+def step_cluster_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster update '
@@ -148,7 +148,7 @@ def step__clusters_patch_kustoclustersupdate(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterAddLanguageExtensions
 @try_manual
-def step__clusters_post(test, rg, checks=None):
+def step_cluster_add_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster add-language-extension '
@@ -161,7 +161,7 @@ def step__clusters_post(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDetachFollowerDatabases
 @try_manual
-def step__clusters_post2(test, rg, checks=None):
+def step_cluster_detach_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster detach-follower-database '
@@ -175,7 +175,7 @@ def step__clusters_post2(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterDiagnoseVirtualNetwork
 @try_manual
-def step__clusters_post3(test, rg, checks=None):
+def step_cluster_diagnose_virtual_network(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster diagnose-virtual-network '
@@ -186,7 +186,7 @@ def step__clusters_post3(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListFollowerDatabases
 @try_manual
-def step__clusters_post4(test, rg, checks=None):
+def step_cluster_list_follower_database(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-follower-database '
@@ -197,7 +197,7 @@ def step__clusters_post4(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterListLanguageExtensions
 @try_manual
-def step__clusters_post5(test, rg, checks=None):
+def step_cluster_list_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster list-language-extension '
@@ -208,7 +208,7 @@ def step__clusters_post5(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClusterRemoveLanguageExtensions
 @try_manual
-def step__clusters_post6(test, rg, checks=None):
+def step_cluster_remove_language_extension(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster remove-language-extension '
@@ -221,7 +221,7 @@ def step__clusters_post6(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStart
 @try_manual
-def step__clusters_post_kustoclustersstart(test, rg, checks=None):
+def step_cluster_start(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster start '
@@ -232,7 +232,7 @@ def step__clusters_post_kustoclustersstart(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/post/KustoClustersStop
 @try_manual
-def step__clusters_post_kustoclustersstop(test, rg, checks=None):
+def step_cluster_stop(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster stop '
@@ -243,7 +243,7 @@ def step__clusters_post_kustoclustersstop(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/put/KustoClusterPrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__clusterprincipalassignments_put(test, rg, checks=None):
+def step_cluster_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment create '
@@ -259,7 +259,7 @@ def step__clusterprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoClusterPrincipalAssignmentsGet
 @try_manual
-def step__clusterprincipalassignments_get(test, rg, checks=None):
+def step_cluster_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment show '
@@ -271,7 +271,7 @@ def step__clusterprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_cluster_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment list '
@@ -282,7 +282,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/put/KustoDatabasePrincipalAssignmentsCreateOrUpdate
 @try_manual
-def step__databaseprincipalassignments_put(test, rg, checks=None):
+def step_database_principal_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment create '
@@ -299,7 +299,7 @@ def step__databaseprincipalassignments_put(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoDatabasePrincipalAssignmentsGet
 @try_manual
-def step__databaseprincipalassignments_get(test, rg, checks=None):
+def step_database_principal_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment show '
@@ -312,7 +312,7 @@ def step__databaseprincipalassignments_get(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/get/KustoPrincipalAssignmentsList
 @try_manual
-def step__clusterprincipalassignments_get2(test, rg, checks=None):
+def step_database_principal_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment list '
@@ -324,7 +324,7 @@ def step__clusterprincipalassignments_get2(test, rg, checks=None):
 
 # EXAMPLE: /DatabasePrincipalAssignments/delete/KustoDatabasePrincipalAssignmentsDelete
 @try_manual
-def step__databaseprincipalassignments_delete(test, rg, checks=None):
+def step_database_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database-principal-assignment delete -y '
@@ -337,7 +337,7 @@ def step__databaseprincipalassignments_delete(test, rg, checks=None):
 
 # EXAMPLE: /Databases/put/KustoDatabasesCreateOrUpdate
 @try_manual
-def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
+def step_database_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database create '
@@ -350,7 +350,7 @@ def step__databases_put_kustodatabasescreateorupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesGet
 @try_manual
-def step__databases_get_kustodatabasesget(test, rg, checks=None):
+def step_database_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database show '
@@ -362,7 +362,7 @@ def step__databases_get_kustodatabasesget(test, rg, checks=None):
 
 # EXAMPLE: /Databases/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_database_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list '
@@ -373,7 +373,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /Databases/patch/KustoDatabasesUpdate
 @try_manual
-def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
+def step_database_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database update '
@@ -386,7 +386,7 @@ def step__databases_patch_kustodatabasesupdate(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseAddPrincipals
 @try_manual
-def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
+def step_database_add_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database add-principal '
@@ -401,7 +401,7 @@ def step__databases_post_kustodatabaseaddprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseListPrincipals
 @try_manual
-def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
+def step_database_list_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database list-principal '
@@ -413,7 +413,7 @@ def step__databases_post_kustodatabaselistprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/post/KustoDatabaseRemovePrincipals
 @try_manual
-def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
+def step_database_remove_principal(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database remove-principal '
@@ -428,7 +428,7 @@ def step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=None):
 
 # EXAMPLE: /Databases/delete/KustoDatabasesDelete
 @try_manual
-def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
+def step_database_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto database delete -y '
@@ -440,7 +440,7 @@ def step__databases_delete_kustodatabasesdelete(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/put/KustoDataConnectionsCreateOrUpdate
 @try_manual
-def step__dataconnections_put(test, rg, checks=None):
+def step_data_connection_event_hub_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub create '
@@ -457,7 +457,7 @@ def step__dataconnections_put(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDatabasesListByCluster
 @try_manual
-def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
+def step_data_connection_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection list '
@@ -469,7 +469,7 @@ def step__databases_get_kustodatabaseslistbycluster(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/get/KustoDataConnectionsGet
 @try_manual
-def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
+def step_data_connection_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection show '
@@ -482,7 +482,7 @@ def step__dataconnections_get_kustodataconnectionsget(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/patch/KustoDataConnectionsUpdate
 @try_manual
-def step__dataconnections_patch(test, rg, checks=None):
+def step_data_connection_event_hub_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub update '
@@ -499,7 +499,7 @@ def step__dataconnections_patch(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/post/KustoDataConnectionValidation
 @try_manual
-def step__dataconnections_post(test, rg, checks=None):
+def step_data_connection_event(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection event-hub data-connection-validation '
@@ -515,7 +515,7 @@ def step__dataconnections_post(test, rg, checks=None):
 
 # EXAMPLE: /DataConnections/delete/KustoDataConnectionsDelete
 @try_manual
-def step__dataconnections_delete(test, rg, checks=None):
+def step_data_connection_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto data-connection delete -y '
@@ -528,7 +528,7 @@ def step__dataconnections_delete(test, rg, checks=None):
 
 # EXAMPLE: /Clusters/delete/KustoClustersDelete
 @try_manual
-def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
+def step_cluster_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster delete -y '
@@ -539,7 +539,7 @@ def step__clusters_delete_kustoclustersdelete(test, rg, checks=None):
 
 # EXAMPLE: /AttachedDatabaseConfigurations/delete/AttachedDatabaseConfigurationsDelete
 @try_manual
-def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
+def step_attached_database_configuration_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto attached-database-configuration delete -y '
@@ -551,7 +551,7 @@ def step__attacheddatabaseconfigurations_delete(test, rg, checks=None):
 
 # EXAMPLE: /ClusterPrincipalAssignments/delete/KustoClusterPrincipalAssignmentsDelete
 @try_manual
-def step__clusterprincipalassignments_delete(test, rg, checks=None):
+def step_cluster_principal_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az kusto cluster-principal-assignment delete -y '

src/test/scenarios/kusto/output/extnosdknoflattentrack1/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py

@@ -11,48 +11,48 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step__attacheddatabaseconfigurations_put
-from .example_steps import step__attacheddatabaseconfigurations_get
-from .example_steps import step__attacheddatabaseconfigurations_get2
-from .example_steps import step__clusters_put_kustoclusterscreateorupdate
-from .example_steps import step__clusters_get_kustoclustersget
-from .example_steps import step__clusters_get_kustoclusterslist
-from .example_steps import step__clusters_get
-from .example_steps import step__clusters_get_kustoclusterslistresourceskus
-from .example_steps import step__clusters_get_kustoclusterslistskus
-from .example_steps import step__clusters_patch_kustoclustersupdate
-from .example_steps import step__clusters_post
-from .example_steps import step__clusters_post2
-from .example_steps import step__clusters_post3
-from .example_steps import step__clusters_post4
-from .example_steps import step__clusters_post5
-from .example_steps import step__clusters_post6
-from .example_steps import step__clusters_post_kustoclustersstart
-from .example_steps import step__clusters_post_kustoclustersstop
-from .example_steps import step__clusterprincipalassignments_put
-from .example_steps import step__clusterprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_put
-from .example_steps import step__databaseprincipalassignments_get
-from .example_steps import step__clusterprincipalassignments_get2
-from .example_steps import step__databaseprincipalassignments_delete
-from .example_steps import step__databases_put_kustodatabasescreateorupdate
-from .example_steps import step__databases_get_kustodatabasesget
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__databases_patch_kustodatabasesupdate
-from .example_steps import step__databases_post_kustodatabaseaddprincipals
-from .example_steps import step__databases_post_kustodatabaselistprincipals
-from .example_steps import step__databases_post_kustodatabaseremoveprincipals
-from .example_steps import step__databases_delete_kustodatabasesdelete
-from .example_steps import step__dataconnections_put
-from .example_steps import step__databases_get_kustodatabaseslistbycluster
-from .example_steps import step__dataconnections_get_kustodataconnectionsget
-from .example_steps import step__dataconnections_patch
-from .example_steps import step__dataconnections_post
-from .example_steps import step__dataconnections_delete
-from .example_steps import step__clusters_delete_kustoclustersdelete
-from .example_steps import step__attacheddatabaseconfigurations_delete
-from .example_steps import step__clusterprincipalassignments_delete
+from .example_steps import step_attached_database_configuration_create
+from .example_steps import step_attached_database_configuration_show
+from .example_steps import step_attached_database_configuration_list
+from .example_steps import step_cluster_create
+from .example_steps import step_cluster_show
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_list_sku
+from .example_steps import step_cluster_update
+from .example_steps import step_cluster_add_language_extension
+from .example_steps import step_cluster_detach_follower_database
+from .example_steps import step_cluster_diagnose_virtual_network
+from .example_steps import step_cluster_list_follower_database
+from .example_steps import step_cluster_list_language_extension
+from .example_steps import step_cluster_remove_language_extension
+from .example_steps import step_cluster_start
+from .example_steps import step_cluster_stop
+from .example_steps import step_cluster_principal_assignment_create
+from .example_steps import step_cluster_principal_assignment_show
+from .example_steps import step_cluster_principal_assignment_list
+from .example_steps import step_database_principal_assignment_create
+from .example_steps import step_database_principal_assignment_show
+from .example_steps import step_database_principal_assignment_list
+from .example_steps import step_database_principal_assignment_delete
+from .example_steps import step_database_create
+from .example_steps import step_database_show
+from .example_steps import step_database_list
+from .example_steps import step_database_update
+from .example_steps import step_database_add_principal
+from .example_steps import step_database_list_principal
+from .example_steps import step_database_remove_principal
+from .example_steps import step_database_delete
+from .example_steps import step_data_connection_event_hub_create
+from .example_steps import step_data_connection_list
+from .example_steps import step_data_connection_show
+from .example_steps import step_data_connection_event_hub_update
+from .example_steps import step_data_connection_event
+from .example_steps import step_data_connection_delete
+from .example_steps import step_cluster_delete
+from .example_steps import step_attached_database_configuration_delete
+from .example_steps import step_cluster_principal_assignment_delete
 from .. import (
     try_manual,
     raise_if,
@@ -79,20 +79,20 @@ def cleanup_scenario(test, rg):
 @try_manual
 def call_scenario(test, rg):
     setup_scenario(test, rg)
-    step__attacheddatabaseconfigurations_put(test, rg, checks=[
+    step_attached_database_configuration_create(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("clusterResourceId", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Kusto"
                    "/Clusters/{myCluster3}", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get(test, rg, checks=[
+    step_attached_database_configuration_show(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("defaultPrincipalsModificationKind", "Union", case_sensitive=False),
     ])
-    step__attacheddatabaseconfigurations_get2(test, rg, checks=[
+    step_attached_database_configuration_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_put_kustoclusterscreateorupdate(test, rg, checks=[
+    step_cluster_create(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -103,7 +103,7 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclustersget(test, rg, checks=[
+    step_cluster_show(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -112,15 +112,15 @@ def call_scenario(test, rg):
         test.check("sku.capacity", 2),
         test.check("sku.tier", "Standard", case_sensitive=False),
     ])
-    step__clusters_get_kustoclusterslist(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get(test, rg, checks=[
+    step_cluster_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__clusters_get_kustoclusterslistresourceskus(test, rg, checks=[])
-    step__clusters_get_kustoclusterslistskus(test, rg, checks=[])
-    step__clusters_patch_kustoclustersupdate(test, rg, checks=[
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_list_sku(test, rg, checks=[])
+    step_cluster_update(test, rg, checks=[
         test.check("name", "{myCluster}", case_sensitive=False),
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "westus", case_sensitive=False),
@@ -133,54 +133,54 @@ def call_scenario(test, rg):
         test.check("keyVaultProperties.keyVaultUri", "https://dummy.keyvault.com", case_sensitive=False),
         test.check("keyVaultProperties.keyVersion", "keyVersion", case_sensitive=False),
     ])
-    step__clusters_post(test, rg, checks=[])
-    step__clusters_post2(test, rg, checks=[])
-    step__clusters_post3(test, rg, checks=[])
-    step__clusters_post4(test, rg, checks=[])
-    step__clusters_post5(test, rg, checks=[])
-    step__clusters_post6(test, rg, checks=[])
-    step__clusters_post_kustoclustersstart(test, rg, checks=[])
-    step__clusters_post_kustoclustersstop(test, rg, checks=[])
-    step__clusterprincipalassignments_put(test, rg, checks=[])
-    step__clusterprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_put(test, rg, checks=[])
-    step__databaseprincipalassignments_get(test, rg, checks=[])
-    step__clusterprincipalassignments_get2(test, rg, checks=[])
-    step__databaseprincipalassignments_delete(test, rg, checks=[])
-    step__databases_put_kustodatabasescreateorupdate(test, rg, checks=[])
-    step__databases_get_kustodatabasesget(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[])
-    step__databases_patch_kustodatabasesupdate(test, rg, checks=[])
-    step__databases_post_kustodatabaseaddprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaselistprincipals(test, rg, checks=[])
-    step__databases_post_kustodatabaseremoveprincipals(test, rg, checks=[])
-    step__databases_delete_kustodatabasesdelete(test, rg, checks=[])
-    step__dataconnections_put(test, rg, checks=[])
-    step__databases_get_kustodatabaseslistbycluster(test, rg, checks=[
+    step_cluster_add_language_extension(test, rg, checks=[])
+    step_cluster_detach_follower_database(test, rg, checks=[])
+    step_cluster_diagnose_virtual_network(test, rg, checks=[])
+    step_cluster_list_follower_database(test, rg, checks=[])
+    step_cluster_list_language_extension(test, rg, checks=[])
+    step_cluster_remove_language_extension(test, rg, checks=[])
+    step_cluster_start(test, rg, checks=[])
+    step_cluster_stop(test, rg, checks=[])
+    step_cluster_principal_assignment_create(test, rg, checks=[])
+    step_cluster_principal_assignment_show(test, rg, checks=[])
+    step_cluster_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_create(test, rg, checks=[])
+    step_database_principal_assignment_show(test, rg, checks=[])
+    step_database_principal_assignment_list(test, rg, checks=[])
+    step_database_principal_assignment_delete(test, rg, checks=[])
+    step_database_create(test, rg, checks=[])
+    step_database_show(test, rg, checks=[])
+    step_database_list(test, rg, checks=[])
+    step_database_update(test, rg, checks=[])
+    step_database_add_principal(test, rg, checks=[])
+    step_database_list_principal(test, rg, checks=[])
+    step_database_remove_principal(test, rg, checks=[])
+    step_database_delete(test, rg, checks=[])
+    step_data_connection_event_hub_create(test, rg, checks=[])
+    step_data_connection_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step__dataconnections_get_kustodataconnectionsget(test, rg, checks=[
+    step_data_connection_show(test, rg, checks=[
         test.check("location", "westus", case_sensitive=False),
         test.check("consumerGroup", "testConsumerGroup1", case_sensitive=False),
         test.check("eventHubResourceId", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Even"
                    "tHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1", case_sensitive=False),
     ])
-    step__dataconnections_patch(test, rg, checks=[])
-    step__dataconnections_post(test, rg, checks=[])
-    step__dataconnections_delete(test, rg, checks=[])
-    step__clusters_delete_kustoclustersdelete(test, rg, checks=[])
-    step__attacheddatabaseconfigurations_delete(test, rg, checks=[])
-    step__clusterprincipalassignments_delete(test, rg, checks=[])
+    step_data_connection_event_hub_update(test, rg, checks=[])
+    step_data_connection_event(test, rg, checks=[])
+    step_data_connection_delete(test, rg, checks=[])
+    step_cluster_delete(test, rg, checks=[])
+    step_attached_database_configuration_delete(test, rg, checks=[])
+    step_cluster_principal_assignment_delete(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class KustoScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestkusto_kustorptest'[:7], key='rg', parameter_name='rg')
-    def test_kusto(self, rg):
+    def test_kusto_Scenario(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/managed-network/configuration/readme.az.md

@@ -9,6 +9,7 @@ az:
   package-name: azure-mgmt-managednetwork
   randomize-names: true
   formalize-names: true
+  resource-type: DATA_NETWORK
 az-output-folder: $(azure-cli-extension-folder)/src/managed-network
 python-sdk-output-folder: $(az-output-folder)/azext_managed_network/vendored_sdks/managednetwork
 
@@ -58,6 +59,24 @@ cli:
             op: CreateOrUpdate
             param: properties
         poly-resource: true
+      - where:
+            group: managedNetworkPeeringPolicies
+            op: Delete
+        max-api: '2020-09-01'
+        min-api: '2019-09-01'
+        resource-type: DATA_COMPUTE
+      - where:
+            group: managedNetworkPeeringPolicies
+        max-api: '2020-07-01-preview'
+        min-api: '2019-07-01'
+        resource-type: DATA_STORAGE_BLOB
+      - where:
+            group: managedNetworkPeeringPolicies
+            op: Delete
+            param: managedNetworkName
+        max-api: '2020-05-01'
+        min-api: '2019-05-01'
+        resource-type: DATA_NETWORK
         #cli-flatten-directive:
         #    - where:
         #        type: ResourceProviderOperation

src/test/scenarios/managed-network/configuration/readme.cli.md

@@ -24,7 +24,7 @@ cli:
       - name: ManagementNetworkGroupsDelete
     ScopeAssignments:
       - name: ScopeAssignmentsPut
-      - name: ScopeAssignmentsGet
-      - name: ScopeAssignmentsList
-      - name: ScopeAssignmentsDelete
+      - name: /ScopeAssignments/get/ScopeAssignmentsGet
+      - name: /ScopeAssignments/get/ScopeAssignmentsList
+      - name: /ScopeAssignments/delete/ScopeAssignmentsDelete
 ```

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/__init__.py

@@ -9,6 +9,7 @@
 # --------------------------------------------------------------------------
 
 from azure.cli.core import AzCommandsLoader
+from azure.cli.core.profiles import ResourceType
 from azext_managed_network.generated._help import helps  # pylint: disable=unused-import
 try:
     from azext_managed_network.manual._help import helps  # pylint: disable=reimported
@@ -25,7 +26,8 @@ class ManagedNetworkManagementClientCommandsLoader(AzCommandsLoader):
             operations_tmpl='azext_managed_network.custom#{}',
             client_factory=cf_managed_network_cl)
         parent = super(ManagedNetworkManagementClientCommandsLoader, self)
-        parent.__init__(cli_ctx=cli_ctx, custom_command_type=managed_network_custom)
+        parent.__init__(cli_ctx=cli_ctx, custom_command_type=managed_network_custom,
+                        resource_type=ResourceType.DATA_NETWORK)
 
     def load_command_table(self, args):
         from azext_managed_network.generated.commands import load_command_table

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py

@@ -27,6 +27,7 @@ from azext_managed_network.action import (
     AddSpokes,
     AddMesh
 )
+from azure.cli.core.profiles import ResourceType
 
 
 def load_arguments(self, _):
@@ -40,8 +41,8 @@ def load_arguments(self, _):
 
     with self.argument_context('managed-network mn create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str, help=''
-                   'The name of the Managed Network.')
+        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str,
+                   help='The name of the Managed Network.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('tags', tags_type)
@@ -50,27 +51,27 @@ def load_arguments(self, _):
 
     with self.argument_context('managed-network mn update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str, help=''
-                   'The name of the Managed Network.', id_part='name')
+        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str,
+                   help='The name of the Managed Network.', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('managed-network mn delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str, help=''
-                   'The name of the Managed Network.', id_part='name')
+        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str,
+                   help='The name of the Managed Network.', id_part='name')
 
     with self.argument_context('managed-network mn get-modify') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str, help=''
-                   'The name of the Managed Network.', id_part='name')
+        c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str,
+                   help='The name of the Managed Network.', id_part='name')
 
     with self.argument_context('managed-network mn scope-assignment list') as c:
         c.argument('scope', type=str, help='The base resource of the scope assignment.')
 
     with self.argument_context('managed-network mn scope-assignment show') as c:
         c.argument('scope', type=str, help='The base resource of the scope assignment.')
-        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str, help=''
-                   'The name of the scope assignment to get.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str,
+                   help='The name of the scope assignment to get.')
 
     with self.argument_context('managed-network mn scope-assignment create') as c:
         c.argument('scope', type=str, help='The base resource of the scope assignment to create. The scope can be any '
@@ -78,8 +79,8 @@ def load_arguments(self, _):
                    '\'subscriptions/{subscription-id}/resourceGroups/{resource-group-name}\' for a resource group, and '
                    '\'subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider'
                    '}/{resource-type}/{resource-name}\' for a resource.')
-        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str, help=''
-                   'The name of the scope assignment to create.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str,
+                   help='The name of the scope assignment to create.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx))
         c.argument('assigned_managed_network', type=str,
                    help='The managed network ID with scope will be assigned to.')
@@ -90,16 +91,16 @@ def load_arguments(self, _):
                    '\'subscriptions/{subscription-id}/resourceGroups/{resource-group-name}\' for a resource group, and '
                    '\'subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider'
                    '}/{resource-type}/{resource-name}\' for a resource.')
-        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str, help=''
-                   'The name of the scope assignment to create.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str,
+                   help='The name of the scope assignment to create.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx))
         c.argument('assigned_managed_network', type=str,
                    help='The managed network ID with scope will be assigned to.')
 
     with self.argument_context('managed-network mn scope-assignment delete') as c:
         c.argument('scope', type=str, help='The scope of the scope assignment to delete.')
-        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str, help=''
-                   'The name of the scope assignment to delete.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n', '--scope-assignment-name'], type=str,
+                   help='The name of the scope assignment to delete.')
 
     with self.argument_context('managed-network mn group list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -165,8 +166,8 @@ def load_arguments(self, _):
     with self.argument_context('managed-network managed-network-peering-policy show') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.', id_part=''
-                   'child_name_1')
+        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.',
+                   id_part='child_name_1')
 
     with self.argument_context('managed-network managed-network-peering-policy hub-and-spoke-topology create') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -191,8 +192,8 @@ def load_arguments(self, _):
     with self.argument_context('managed-network managed-network-peering-policy hub-and-spoke-topology update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.', id_part=''
-                   'child_name_1')
+        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.',
+                   id_part='child_name_1')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('hub', action=AddHub, nargs='*', help='Gets or sets the hub virtual network ID')
@@ -203,8 +204,8 @@ def load_arguments(self, _):
     with self.argument_context('managed-network managed-network-peering-policy mesh-topology update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.', id_part=''
-                   'child_name_1')
+        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.',
+                   id_part='child_name_1')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('hub', action=AddHub, nargs='*', help='Gets or sets the hub virtual network ID')
@@ -214,12 +215,13 @@ def load_arguments(self, _):
 
     with self.argument_context('managed-network managed-network-peering-policy delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.', id_part=''
-                   'child_name_1')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name',
+                   max_api='2020-05-01', min_api='2019-05-01', resource_type=ResourceType.DATA_NETWORK)
+        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.',
+                   id_part='child_name_1')
 
     with self.argument_context('managed-network managed-network-peering-policy wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.', id_part=''
-                   'child_name_1')
+        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.',
+                   id_part='child_name_1')

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/commands.py

@@ -11,6 +11,7 @@
 # pylint: disable=too-many-locals
 
 from azure.cli.core.commands import CliCommandType
+from azure.cli.core.profiles import ResourceType
 
 
 def load_command_table(self, _):
@@ -62,19 +63,24 @@ def load_command_table(self, _):
         client_factory=cf_managed_network_peering_policy)
     with self.command_group('managed-network managed-network-peering-policy',
                             managed_network_managed_network_peering_policy,
-                            client_factory=cf_managed_network_peering_policy, is_preview=True) as g:
+                            client_factory=cf_managed_network_peering_policy, is_preview=True,
+                            max_api='2020-07-01-preview', min_api='2019-07-01',
+                            resource_type=ResourceType.DATA_STORAGE_BLOB) as g:
         g.custom_command('list', 'managed_network_managed_network_peering_policy_list')
         g.custom_show_command('show', 'managed_network_managed_network_peering_policy_show')
         g.custom_command('hub-and-spoke-topology create', 'managed_network_managed_network_peering_policy_hub_and_spoke'
                          '_topology_create', supports_no_wait=True)
         g.custom_command('mesh-topology create', 'managed_network_managed_network_peering_policy_mesh_topology_create',
                          supports_no_wait=True)
-        g.generic_update_command('hub-and-spoke-topology update', setter_arg_name='properties', setter_name=''
-                                 'begin_create_or_update', custom_func_name='managed_network_managed_network_peering_po'
-                                 'licy_hub_and_spoke_topology_update', supports_no_wait=True)
-        g.generic_update_command('mesh-topology update', setter_arg_name='properties', setter_name=''
-                                 'begin_create_or_update', custom_func_name='managed_network_managed_network_peering_po'
-                                 'licy_mesh_topology_update', supports_no_wait=True)
+        g.generic_update_command('hub-and-spoke-topology update', setter_arg_name='properties',
+                                 setter_name='begin_create_or_update',
+                                 custom_func_name='managed_network_managed_network_peering_policy_hub_and_spoke_topolog'
+                                 'y_update', supports_no_wait=True)
+        g.generic_update_command('mesh-topology update', setter_arg_name='properties',
+                                 setter_name='begin_create_or_update',
+                                 custom_func_name='managed_network_managed_network_peering_policy_mesh_topology_update',
+                                 supports_no_wait=True)
         g.custom_command('delete', 'managed_network_managed_network_peering_policy_delete', supports_no_wait=True,
-                         confirmation=True)
+                         confirmation=True, max_api='2020-09-01', min_api='2019-09-01',
+                         resource_type=ResourceType.DATA_COMPUTE)
         g.custom_wait_command('wait', 'managed_network_managed_network_peering_policy_show')

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /ManagedNetworks/put/ManagedNetworksPut
 @try_manual
-def step__managednetworks_put_managednetworksput(test, rg, checks=None):
+def step_mn_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn create '
@@ -35,7 +35,7 @@ def step__managednetworks_put_managednetworksput(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworks/get/ManagedNetworksGet
 @try_manual
-def step__managednetworks_get_managednetworksget(test, rg, checks=None):
+def step_mn_get_modify(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn get-modify '
@@ -46,7 +46,7 @@ def step__managednetworks_get_managednetworksget(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworks/get/ManagedNetworksListByResourceGroup
 @try_manual
-def step__managednetworks_get(test, rg, checks=None):
+def step_mn_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn list '
@@ -56,7 +56,7 @@ def step__managednetworks_get(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworks/get/ManagedNetworksListBySubscription
 @try_manual
-def step__managednetworks_get2(test, rg, checks=None):
+def step_mn_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn list '
@@ -66,7 +66,7 @@ def step__managednetworks_get2(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworks/patch/ManagedNetworksPatch
 @try_manual
-def step__managednetworks_patch_managednetworkspatch(test, rg, checks=None):
+def step_mn_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn update '
@@ -77,7 +77,7 @@ def step__managednetworks_patch_managednetworkspatch(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkGroups/put/ManagementNetworkGroupsPut
 @try_manual
-def step__managednetworkgroups_put(test, rg, checks=None):
+def step_mn_group_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn group create '
@@ -100,7 +100,7 @@ def step__managednetworkgroups_put(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkGroups/get/ManagedNetworksGroupsListByManagedNetwork
 @try_manual
-def step__managednetworkgroups_get(test, rg, checks=None):
+def step_mn_group_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn group list '
@@ -111,7 +111,7 @@ def step__managednetworkgroups_get(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkGroups/get/ManagementNetworkGroupsGet
 @try_manual
-def step__managednetworkgroups_get2(test, rg, checks=None):
+def step_mn_group_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn group show '
@@ -123,7 +123,7 @@ def step__managednetworkgroups_get2(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkPeeringPolicies/put/ManagedNetworkPeeringPoliciesPut
 @try_manual
-def step__managednetworkpeeringpolicies_put(test, rg, checks=None):
+def step_managed_network_peering(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network managed-network-peering-policy hub-and-spoke-topology create '
@@ -139,7 +139,7 @@ def step__managednetworkpeeringpolicies_put(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkPeeringPolicies/put/ManagedNetworkPeeringPoliciesPut
 @try_manual
-def step__managednetworkpeeringpolicies_put(test, rg, checks=None):
+def step_managed_network_peering(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network managed-network-peering-policy hub-and-spoke-topology create '
@@ -155,7 +155,7 @@ def step__managednetworkpeeringpolicies_put(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkPeeringPolicies/get/ManagedNetworkPeeringPoliciesGet
 @try_manual
-def step__managednetworkpeeringpolicies_get(test, rg, checks=None):
+def step_managed_network_peering_policy_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network managed-network-peering-policy show '
@@ -167,7 +167,7 @@ def step__managednetworkpeeringpolicies_get(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkPeeringPolicies/get/ManagedNetworkPeeringPoliciesListByManagedNetwork
 @try_manual
-def step__managednetworkpeeringpolicies_get2(test, rg, checks=None):
+def step_managed_network_peering_policy_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network managed-network-peering-policy list '
@@ -178,7 +178,7 @@ def step__managednetworkpeeringpolicies_get2(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkPeeringPolicies/delete/ManagedNetworkPeeringPoliciesDelete
 @try_manual
-def step__managednetworkpeeringpolicies_delete(test, rg, checks=None):
+def step_managed_network_peering_policy_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network managed-network-peering-policy delete -y '
@@ -190,7 +190,7 @@ def step__managednetworkpeeringpolicies_delete(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworkGroups/delete/ManagementNetworkGroupsDelete
 @try_manual
-def step__managednetworkgroups_delete(test, rg, checks=None):
+def step_mn_group_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn group delete -y '
@@ -202,7 +202,7 @@ def step__managednetworkgroups_delete(test, rg, checks=None):
 
 # EXAMPLE: /ScopeAssignments/put/ScopeAssignmentsPut
 @try_manual
-def step__scopeassignments_put_scopeassignmentsput(test, rg, checks=None):
+def step_mn_scope_assignment_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn scope-assignment create '
@@ -215,7 +215,7 @@ def step__scopeassignments_put_scopeassignmentsput(test, rg, checks=None):
 
 # EXAMPLE: /ScopeAssignments/get/ScopeAssignmentsGet
 @try_manual
-def step__scopeassignments_get_scopeassignmentsget(test, rg, checks=None):
+def step_mn_scope_assignment_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn scope-assignment show '
@@ -226,7 +226,7 @@ def step__scopeassignments_get_scopeassignmentsget(test, rg, checks=None):
 
 # EXAMPLE: /ScopeAssignments/get/ScopeAssignmentsList
 @try_manual
-def step__scopeassignments_get_scopeassignmentslist(test, rg, checks=None):
+def step_mn_scope_assignment_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn scope-assignment list '
@@ -236,7 +236,7 @@ def step__scopeassignments_get_scopeassignmentslist(test, rg, checks=None):
 
 # EXAMPLE: /ScopeAssignments/delete/ScopeAssignmentsDelete
 @try_manual
-def step__scopeassignments_delete(test, rg, checks=None):
+def step_mn_scope_assignment_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn scope-assignment delete -y '
@@ -247,7 +247,7 @@ def step__scopeassignments_delete(test, rg, checks=None):
 
 # EXAMPLE: /ManagedNetworks/delete/ManagedNetworksDelete
 @try_manual
-def step__managednetworks_delete_managednetworksdelete(test, rg, checks=None):
+def step_mn_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az managed-network mn delete -y '

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/test_ManagedNetworks_scenario.py

@@ -12,23 +12,23 @@ import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
 from .preparers import VirtualNetworkPreparer
-from .example_steps import step_managednetworksput
-from .example_steps import step_managementnetworkgroupsput
-from .example_steps import step_managednetworkpeeringpoliciesput
-from .example_steps import step_managednetworksget
+from .example_steps import step_mn_create
+from .example_steps import step_mn_group_create
+from .example_steps import step_managed_network_peering
+from .example_steps import step_mn_get_modify
 from azure.cli.testsdk import ResourceGroupPreparer
 from .preparers import VirtualNetworkPreparer
-from .example_steps import step_managednetworkslistbyresourcegroup
-from .example_steps import step_managednetworkslistbysubscription
-from .example_steps import step_managednetworksdelete
-from .example_steps import step_managementnetworkgroupsget
+from .example_steps import step_mn_list
+from .example_steps import step_mn_list
+from .example_steps import step_mn_delete
+from .example_steps import step_mn_group_show
 from azure.cli.testsdk import ResourceGroupPreparer
 from .preparers import VirtualNetworkPreparer
-from .example_steps import step_managednetworksgroupslistbymanagednetwork
-from .example_steps import step_managednetworkpeeringpoliciesget
-from .example_steps import step_managednetworkpeeringpolicieslistbymanagednet
-from .example_steps import step_managednetworkpeeringpoliciesdelete
-from .example_steps import step_managementnetworkgroupsdelete
+from .example_steps import step_mn_group_list
+from .example_steps import step_managed_network_peering_policy_show
+from .example_steps import step_managed_network_peering_policy_list
+from .example_steps import step_managed_network_peering_policy_delete
+from .example_steps import step_mn_group_delete
 from .. import (
     try_manual,
     raise_if,
@@ -55,20 +55,20 @@ def cleanup_scenario1(test, rg):
 @try_manual
 def call_scenario1(test, rg):
     setup_scenario1(test, rg)
-    step_managednetworksput(test, rg, checks=[
+    step_mn_create(test, rg, checks=[
         test.check("location", "eastus", case_sensitive=False),
         test.check("name", "{myManagedNetwork}", case_sensitive=False),
     ])
-    step_managementnetworkgroupsput(test, rg, checks=[
+    step_mn_group_create(test, rg, checks=[
         test.check("managementGroups", []),
         test.check("name", "{myManagedNetworkGroup}", case_sensitive=False),
     ])
-    step_managednetworkpeeringpoliciesput(test, rg, checks=[])
-    step_managednetworksget(test, rg, checks=[])
+    step_managed_network_peering(test, rg, checks=[])
+    step_mn_get_modify(test, rg, checks=[])
     cleanup_scenario1(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for scenario1
 @try_manual
 class ManagedNetworksscenario1Test(ScenarioTest):
 
@@ -77,7 +77,7 @@ class ManagedNetworksscenario1Test(ScenarioTest):
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetB'[:7], key='vn_2', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetC'[:7], key='vn_3', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_myHubVnet'[:7], key='vn_4', resource_group_key='rg')
-    def test_managed_network(self, rg):
+    def test_ManagedNetworks_scenario1(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()
@@ -111,16 +111,16 @@ def cleanup_scenario2(test, rg):
 @try_manual
 def call_scenario2(test, rg):
     setup_scenario2(test, rg)
-    step_managednetworkslistbyresourcegroup(test, rg, checks=[])
-    step_managednetworkslistbysubscription(test, rg, checks=[
+    step_mn_list(test, rg, checks=[])
+    step_mn_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step_managednetworksdelete(test, rg, checks=[])
-    step_managementnetworkgroupsget(test, rg, checks=[])
+    step_mn_delete(test, rg, checks=[])
+    step_mn_group_show(test, rg, checks=[])
     cleanup_scenario2(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for scenario2
 @try_manual
 class ManagedNetworksscenario2Test(ScenarioTest):
 
@@ -129,7 +129,7 @@ class ManagedNetworksscenario2Test(ScenarioTest):
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetB'[:7], key='vn_2', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetC'[:7], key='vn_3', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_myHubVnet'[:7], key='vn_4', resource_group_key='rg')
-    def test_managed_network(self, rg):
+    def test_ManagedNetworks_scenario2(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()
@@ -163,15 +163,15 @@ def cleanup_scenario3(test, rg):
 @try_manual
 def call_scenario3(test, rg):
     setup_scenario3(test, rg)
-    step_managednetworksgroupslistbymanagednetwork(test, rg, checks=[])
-    step_managednetworkpeeringpoliciesget(test, rg, checks=[])
-    step_managednetworkpeeringpolicieslistbymanagednet(test, rg, checks=[])
-    step_managednetworkpeeringpoliciesdelete(test, rg, checks=[])
-    step_managementnetworkgroupsdelete(test, rg, checks=[])
+    step_mn_group_list(test, rg, checks=[])
+    step_managed_network_peering_policy_show(test, rg, checks=[])
+    step_managed_network_peering_policy_list(test, rg, checks=[])
+    step_managed_network_peering_policy_delete(test, rg, checks=[])
+    step_mn_group_delete(test, rg, checks=[])
     cleanup_scenario3(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for scenario3
 @try_manual
 class ManagedNetworksscenario3Test(ScenarioTest):
 
@@ -180,7 +180,7 @@ class ManagedNetworksscenario3Test(ScenarioTest):
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetB'[:7], key='vn_2', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetC'[:7], key='vn_3', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_myHubVnet'[:7], key='vn_4', resource_group_key='rg')
-    def test_managed_network(self, rg):
+    def test_ManagedNetworks_scenario3(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/test_ScopeAssignments_scenario.py

@@ -12,10 +12,10 @@ import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
 from .preparers import VirtualNetworkPreparer
-from .example_steps import step_scopeassignmentsput
-from .example_steps import step_scopeassignmentsget
-from .example_steps import step_scopeassignmentslist
-from .example_steps import step_scopeassignmentsdelete
+from .example_steps import step_mn_scope_assignment_create
+from .example_steps import step_mn_scope_assignment_show
+from .example_steps import step_mn_scope_assignment_list
+from .example_steps import step_mn_scope_assignment_delete
 from .. import (
     try_manual,
     raise_if,
@@ -42,24 +42,24 @@ def cleanup_scenario(test, rg):
 @try_manual
 def call_scenario(test, rg):
     setup_scenario(test, rg)
-    step_scopeassignmentsput(test, rg, checks=[
+    step_mn_scope_assignment_create(test, rg, checks=[
         test.check("assignedManagedNetwork", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft."
                    "ManagedNetwork/managedNetworks/{myManagedNetwork}", case_sensitive=False),
         test.check("name", "{myScopeAssignment}", case_sensitive=False),
     ])
-    step_scopeassignmentsget(test, rg, checks=[
+    step_mn_scope_assignment_show(test, rg, checks=[
         test.check("assignedManagedNetwork", "/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft."
                    "ManagedNetwork/managedNetworks/{myManagedNetwork}", case_sensitive=False),
         test.check("name", "{myScopeAssignment}", case_sensitive=False),
     ])
-    step_scopeassignmentslist(test, rg, checks=[
+    step_mn_scope_assignment_list(test, rg, checks=[
         test.check('length(@)', 1),
     ])
-    step_scopeassignmentsdelete(test, rg, checks=[])
+    step_mn_scope_assignment_delete(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class ScopeAssignmentsScenarioTest(ScenarioTest):
 
@@ -68,7 +68,7 @@ class ScopeAssignmentsScenarioTest(ScenarioTest):
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetB'[:7], key='vn_2', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_VnetC'[:7], key='vn_3', resource_group_key='rg')
     @VirtualNetworkPreparer(name_prefix='clitestmanaged_network_myHubVnet'[:7], key='vn_4', resource_group_key='rg')
-    def test_managed_network(self, rg):
+    def test_ScopeAssignments_Scenario(self, rg):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/tests/latest/example_steps.py

@@ -14,7 +14,7 @@ from .. import try_manual
 
 # EXAMPLE: /RemoteRenderingAccounts/put/Create remote rendering account
 @try_manual
-def step__remoterenderingaccounts_put(test, rg, checks=None):
+def step_create(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account create '
@@ -26,7 +26,7 @@ def step__remoterenderingaccounts_put(test, rg, checks=None):
 
 # EXAMPLE: /RemoteRenderingAccounts/get/Get remote rendering account
 @try_manual
-def step__remoterenderingaccounts_get(test, rg, checks=None):
+def step_show(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account show '
@@ -37,7 +37,7 @@ def step__remoterenderingaccounts_get(test, rg, checks=None):
 
 # EXAMPLE: /RemoteRenderingAccounts/get/List remote rendering accounts by resource group
 @try_manual
-def step__remoterenderingaccounts_get2(test, rg, checks=None):
+def step_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account list '
@@ -47,7 +47,7 @@ def step__remoterenderingaccounts_get2(test, rg, checks=None):
 
 # EXAMPLE: /RemoteRenderingAccounts/get/List remote rendering accounts by subscription
 @try_manual
-def step__remoterenderingaccounts_get3(test, rg, checks=None):
+def step_list(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account list '
@@ -57,7 +57,7 @@ def step__remoterenderingaccounts_get3(test, rg, checks=None):
 
 # EXAMPLE: /RemoteRenderingAccounts/patch/Update remote rendering account
 @try_manual
-def step__remoterenderingaccounts_patch(test, rg, checks=None):
+def step_update(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account update '
@@ -70,7 +70,7 @@ def step__remoterenderingaccounts_patch(test, rg, checks=None):
 
 # EXAMPLE: /RemoteRenderingAccounts/post/List remote rendering account key
 @try_manual
-def step__remoterenderingaccounts_post(test, rg, checks=None):
+def step_list_key(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account list-key '
@@ -81,7 +81,7 @@ def step__remoterenderingaccounts_post(test, rg, checks=None):
 
 # EXAMPLE: /RemoteRenderingAccounts/post/Regenerate remote rendering account keys
 @try_manual
-def step__remoterenderingaccounts_post2(test, rg, checks=None):
+def step_regenerate_key(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account regenerate-key '
@@ -93,7 +93,7 @@ def step__remoterenderingaccounts_post2(test, rg, checks=None):
 
 # EXAMPLE: /RemoteRenderingAccounts/delete/Delete remote rendering account
 @try_manual
-def step__remoterenderingaccounts_delete(test, rg, checks=None):
+def step_delete(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az remote-rendering-account delete -y '
@@ -104,7 +104,7 @@ def step__remoterenderingaccounts_delete(test, rg, checks=None):
 
 # EXAMPLE: /SpatialAnchorsAccounts/post/Regenerate spatial anchors account keys
 @try_manual
-def step__spatialanchorsaccounts_post(test, rg, checks=None):
+def step_regenerate_key(test, rg, checks=None):
     if checks is None:
         checks = []
     test.cmd('az spatial-anchors-account regenerate-key '

src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/tests/latest/test_mixed_reality_scenario_incrementalGenerated.py

@@ -11,14 +11,14 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step_create_remote_rendering_account
-from .example_steps import step_list_remote_rendering
-from .example_steps import step_get_remote_rendering_account
-from .example_steps import step_list_remote_rendering2
-from .example_steps import step_regenerate_remote_rendering_account_keys
-from .example_steps import step_regenerate_spatial_anchors_account_keys
-from .example_steps import step_update_remote_rendering_account
-from .example_steps import step_delete_remote_rendering_account
+from .example_steps import step_create
+from .example_steps import step_list
+from .example_steps import step_show
+from .example_steps import step_list
+from .example_steps import step_regenerate_key
+from .example_steps import step_regenerate_key
+from .example_steps import step_update
+from .example_steps import step_delete
 from .. import (
     try_manual,
     raise_if,
@@ -46,32 +46,32 @@ def cleanup_scenario(test, rg):
 def call_scenario(test, rg):
     setup_scenario(test, rg)
     # STEP NOT FOUND: Create spatial anchor account
-    step_create_remote_rendering_account(test, rg, checks=[])
+    step_create(test, rg, checks=[])
     # STEP NOT FOUND: Get remote rendering account key
     # STEP NOT FOUND: Get spatial anchor account key
     # STEP NOT FOUND: List spatial anchor accounts by resource group
-    step_list_remote_rendering(test, rg, checks=[])
+    step_list(test, rg, checks=[])
     # STEP NOT FOUND: Get spatial anchors account
-    step_get_remote_rendering_account(test, rg, checks=[])
-    step_list_remote_rendering2(test, rg, checks=[])
+    step_show(test, rg, checks=[])
+    step_list(test, rg, checks=[])
     # STEP NOT FOUND: List spatial anchors accounts by subscription
     # STEP NOT FOUND: List available operations
-    step_regenerate_remote_rendering_account_keys(test, rg, checks=[])
-    step_regenerate_spatial_anchors_account_keys(test, rg, checks=[])
-    step_update_remote_rendering_account(test, rg, checks=[])
+    step_regenerate_key(test, rg, checks=[])
+    step_regenerate_key(test, rg, checks=[])
+    step_update(test, rg, checks=[])
     # STEP NOT FOUND: Update spatial anchors account
     # STEP NOT FOUND: CheckLocalNameAvailability
     # STEP NOT FOUND: Delete spatial anchors account
-    step_delete_remote_rendering_account(test, rg, checks=[])
+    step_delete(test, rg, checks=[])
     cleanup_scenario(test, rg)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class Mixed_realityScenarioTest(ScenarioTest):
 
     @ResourceGroupPreparer(name_prefix='clitestmixed_reality_MyResourceGroup'[:7], key='rg', parameter_name='rg')
-    def test_mixed_reality(self, rg):
+    def test_mixed_reality_Scenario(self, rg):
 
         call_scenario(self, rg)
         calc_coverage(__file__)

src/test/scenarios/synapse/output/coredefault/src/azure-cli/azure/cli/command_modules/synapse/generated/_params.py

@@ -564,15 +564,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-vulnerability-assessment-scan initiate-scan') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-security-alert-policy show') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -740,15 +740,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse workspace-managed-identity-sql-control-setting update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse integration-runtime list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -933,24 +933,24 @@ def load_arguments(self, _):
 
     with self.argument_context('synapse private-link-hub show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
 
     with self.argument_context('synapse private-link-hub create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub')
         c.argument('tags', tags_type)
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
 
     with self.argument_context('synapse private-link-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('synapse private-link-hub delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')

src/test/scenarios/synapse/output/coredefault/src/azure-cli/azure/cli/command_modules/synapse/tests/latest/test_synapse_scenario.py

@@ -12,109 +12,109 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step_create_or_update_a_workspace
-from .example_steps import step_create_or_update_a_big_data_pool
-from .example_steps import step_list_big_data_pools_in_a_workspace
-from .example_steps import step_update_a_big_data_pool
-from .example_steps import step_create_integration_runtime
-from .example_steps import step_get_integration_runtime
-from .example_steps import step_list_integration_runtimes
-from .example_steps import step_start_integration_runtime
-from .example_steps import step_stop_integration_runtime
-from .example_steps import step_upgrade_integration_runtime
-from .example_steps import step_update_integration_runtime
-from .example_steps import step_list_auth_keys
-from .example_steps import step_regenerate_auth_key
-from .example_steps import step_get_connection_info
-from .example_steps import step_sync_credentials
-from .example_steps import step_get_monitoring_data
-from .example_steps import step_get_integration_runtime_node_ip_address
-from .example_steps import step_get_integration_runtime_node
-from .example_steps import step_update_integration_runtime_node
-from .example_steps import step_get_integration_runtime_object_metadata
-from .example_steps import step_refresh_object_metadata
-from .example_steps import step_get_status
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_list_ip_firewall_rules_in_a_workspace
-from .example_steps import step_replace_all_ip_firewall_rules_in_a_workspace
-from .example_steps import step_get_azure_async_operation_header_result
-from .example_steps import step_get_location_header_result
-from .example_steps import step_approve_private_endpoint_connection
-from .example_steps import step_get_private_endpoint_connection
-from .example_steps import step_list_private_endpoint
-from .example_steps import step_create_or_update_a_privatelinkhub
-from .example_steps import step_get_a_privatelinkhub
-from .example_steps import step_list_privatelinkhubs_in_resource_group
-from .example_steps import step_list_privatelinkhubs_in_subscription
-from .example_steps import step_update_a_privatelinkhub
-from .example_steps import step_get_a_big_data_pool
-from .example_steps import step_get_a_workspace
-from .example_steps import step_list_workspaces_in_resource_group
-from .example_steps import step_list_workspaces_in_subscription
-from .example_steps import step_update_a_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_create_a_sql_analytics_pool
-from .example_steps import step_get_a_sql_analytics_pool
-from .example_steps import step_list_sql_analytics_pools_in_a_workspace
-from .example_steps import step_list_sql_analytics
-from .example_steps import step_pause_a_sql_analytics_pool
-from .example_steps import step_rename_a_sql_analytics_pool
-from .example_steps import step_resume_a_sql_analytics_pool
-from .example_steps import step_update_a_sql_analytics_pool
-from .example_steps import step_create_or_update
-from .example_steps import step_create_or_update2
-from .example_steps import step_get_blob_auditing
-from .example_steps import step_get_a_connection
-from .example_steps import step_get_a_sql_analytics_pool_user_activity
-from .example_steps import step_get_sql_pool_geo_backup_policy
-from .example_steps import step_set_metadata_sync
-from .example_steps import step_get_metadata_sync
-from .example_steps import step_get_the_result
-from .example_steps import step_list_the_sql
-from .example_steps import step_lists_a_sql_analytic_pool_s_replication_links
-from .example_steps import step_get_a_list
-from .example_steps import step_creates_sql_pool_restore_point_
-from .example_steps import step_list_the_schema_in_a_sql_analytics_pool
-from .example_steps import step_update_a_sql
-from .example_steps import step_update_a_sql2
-from .example_steps import step_get_a_security_alert_of_a_sql_analytics_pool
-from .example_steps import step_updates_the_sensitivity
-from .example_steps import step_gets_the_current
-from .example_steps import step_gets_the_recommended
-from .example_steps import step_disables_sensitivity_recommendations
-from .example_steps import step_enables_sensitivity_recommendations
-from .example_steps import step_list_the_columns
-from .example_steps import step_list_the_tables
-from .example_steps import step_create_or_update3
-from .example_steps import step_get_transparent_data
-from .example_steps import step_list_the_usages_of_a_sql_analytics_pool
-from .example_steps import step_creates_or_updates
-from .example_steps import step_get_a_vulnerability
-from .example_steps import step_executes_a_sql
-from .example_steps import step_export_a_database
-from .example_steps import step_create_a_database
-from .example_steps import step_create_a_database2
-from .example_steps import step_create_a_database3
-from .example_steps import step_get_a_sql_pool_s_vulnerability_assessment
-from .example_steps import step_get_a_vulnerability2
-from .example_steps import step_deletes_the_sensitivity
-from .example_steps import step_create_or_update4
-from .example_steps import step_get_workspace_active_directory_admin
-from .example_steps import step_create_or_update5
-from .example_steps import step_get_managed_identity_sql_control_settings
-from .example_steps import step_delete_a_big_data_pool
-from .example_steps import step_delete_integration_runtime_node
-from .example_steps import step_delete_integration_runtime
-from .example_steps import step_delete_an_ip_firewall_rule_from_a_workspace
-from .example_steps import step_delete_private_endpoint_connection
-from .example_steps import step_removes_a_database
-from .example_steps import step_delete_a_privatelinkhub
-from .example_steps import step_remove_a_database_s_vulnerability_assessment
-from .example_steps import step_delete_a_sql_analytics_pool
-from .example_steps import step_delete_workspace_active_directory_admin
-from .example_steps import step_delete_a_workspace
+from .example_steps import step_workspace_create
+from .example_steps import step_big_data_pool_create
+from .example_steps import step_big_data_pool_list
+from .example_steps import step_big_data_pool_update
+from .example_steps import step_integration_runtime_create
+from .example_steps import step_integration_runtime_show
+from .example_steps import step_integration_runtime_list
+from .example_steps import step_integration_runtime_start
+from .example_steps import step_integration_runtime_stop
+from .example_steps import step_integration_runtime_upgrade
+from .example_steps import step_integration_runtime_update
+from .example_steps import step_integration_runtime_auth_key_list
+from .example_steps import step_integration_runtime_auth_key_regenerate
+from .example_steps import step_integration_runtime_connection_info_get
+from .example_steps import step_integration_runtime_credentials_sync
+from .example_steps import step_integration_runtime_monitoring_data_get
+from .example_steps import step_integration_runtime_node_ip_address_get
+from .example_steps import step_integration_runtime_node_show
+from .example_steps import step_integration_runtime_node_update
+from .example_steps import step_integration_runtime_object_metadata_get
+from .example_steps import step_integration_runtime_object_metadata_refresh
+from .example_steps import step_integration_runtime_status_get
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_list
+from .example_steps import step_ip_firewall_rule_replace_all
+from .example_steps import step_operation_get_azure_async_header_result
+from .example_steps import step_operation_get_location_header_result
+from .example_steps import step_private_endpoint_connection_create
+from .example_steps import step_private_endpoint_connection_show
+from .example_steps import step_private_endpoint_connection_list
+from .example_steps import step_private_link_hub_create
+from .example_steps import step_private_link_hub_show
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_update
+from .example_steps import step_big_data_pool_show
+from .example_steps import step_workspace_show
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_update
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_sql_pool_create
+from .example_steps import step_sql_pool_show
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_pause
+from .example_steps import step_sql_pool_rename
+from .example_steps import step_sql_pool_resume
+from .example_steps import step_sql_pool_update
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_show
+from .example_steps import step_sql_pool_connection_policy_show
+from .example_steps import step_sql_pool_data_warehouse_user_activity_show
+from .example_steps import step_sql_pool_geo_backup_policy_show
+from .example_steps import step_sql_pool_metadata_sync_config_create
+from .example_steps import step_sql_pool_metadata_sync_config_show
+from .example_steps import step_sql_pool_operation
+from .example_steps import step_sql_pool_operation_list
+from .example_steps import step_sql_pool_replication_link_list
+from .example_steps import step_sql_pool_restore_point_list
+from .example_steps import step_sql_pool_restore_point_create
+from .example_steps import step_sql_pool_schema_list
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_show
+from .example_steps import step_sql_pool_sensitivity_label_create
+from .example_steps import step_sql_pool_sensitivity_label_list_current
+from .example_steps import step_sql_pool_sensitivity_label_list_recommended
+from .example_steps import step_sql_pool_sensitivity
+from .example_steps import step_sql_pool_sensitivity2
+from .example_steps import step_sql_pool_table_column_list
+from .example_steps import step_sql_pool_table_list
+from .example_steps import step_sql_pool_transparent_data_encryption_create
+from .example_steps import step_sql_pool_transparent_data_encryption_show
+from .example_steps import step_sql_pool_usage_list
+from .example_steps import step_sql_pool_vulnerability
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_list
+from .example_steps import step_sql_pool_vulnerability3
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_export
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_show
+from .example_steps import step_sql_pool_vulnerability_assessment_list
+from .example_steps import step_sql_pool_sensitivity_label_delete
+from .example_steps import step_workspace_aad_admin_create
+from .example_steps import step_workspace_aad_admin_show
+from .example_steps import step_workspace_managed_identity
+from .example_steps import step_workspace_managed_identity2
+from .example_steps import step_big_data_pool_delete
+from .example_steps import step_integration_runtime_node_delete
+from .example_steps import step_integration_runtime_delete
+from .example_steps import step_ip_firewall_rule_delete
+from .example_steps import step_private_endpoint_connection_delete
+from .example_steps import step_sql_pool_vulnerability2
+from .example_steps import step_private_link_hub_delete
+from .example_steps import step_sql_pool_vulnerability_assessment_delete
+from .example_steps import step_sql_pool_delete
+from .example_steps import step_workspace_aad_admin_delete
+from .example_steps import step_workspace_delete
 from .. import (
     try_manual,
     raise_if,
@@ -145,8 +145,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
                   rg_16, rg_17):
     setup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
                    rg_16, rg_17)
-    step_create_or_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_workspace_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "East US", case_sensitive=False),
         test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
@@ -159,8 +159,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myWorkspace2}", case_sensitive=False),
     ])
-    step_create_or_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -176,12 +176,12 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_list_big_data_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -197,102 +197,102 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_create_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_get_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_integration_runtimes(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                   rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_start_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_start(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_stop_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_integration_runtime_stop(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                   rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_upgrade_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_upgrade(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_auth_keys(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_regenerate_auth_key(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_connection_info(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_sync_credentials(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_monitoring_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node_ip_address(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_integration_runtime_auth_key_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_auth_key_regenerate(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_connection_info_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_credentials_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_monitoring_data_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_ip_address_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_refresh(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_status_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_replace_all(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_operation_get_azure_async_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_refresh_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_status(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_replace_all_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_azure_async_operation_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_approve_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_private_endpoint(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_operation_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_private_link_hub_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_create_or_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_get_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_list_privatelinkhubs_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_list_privatelinkhubs_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_private_link_hub_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "East US", case_sensitive=False),
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
     ])
-    step_get_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -307,42 +307,42 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sparkVersion", "2.4", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_get_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_workspace_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                          rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_list_workspaces_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_list_workspaces_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("collation", "", case_sensitive=False),
         test.check("createMode", "", case_sensitive=False),
@@ -355,146 +355,146 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sku.tier", "", case_sensitive=False),
         test.check("name", "{mySqlPool2}", case_sensitive=False),
     ])
-    step_get_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_pause_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_rename_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_resume_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "West US 2", case_sensitive=False),
-        test.check("collation", "", case_sensitive=False),
-        test.check("createMode", "", case_sensitive=False),
-        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("maxSizeBytes", 0),
-        test.check("recoverableDatabaseId", "", case_sensitive=False),
-        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("sourceDatabaseId", "", case_sensitive=False),
-        test.check("sku.name", "", case_sensitive=False),
-        test.check("sku.tier", "", case_sensitive=False),
-        test.check("name", "{mySqlPool2}", case_sensitive=False),
-    ])
-    step_create_or_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_blob_auditing(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_a_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_analytics_pool_user_activity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_sql_pool_geo_backup_policy(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_set_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_the_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_list_the_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_lists_a_sql_analytic_pool_s_replication_links(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_creates_sql_pool_restore_point_(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_schema_in_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                        rg_15, rg_16, rg_17, checks=[])
-    step_get_a_security_alert_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_updates_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_disables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_enables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_columns(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_list_the_tables(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                         rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_transparent_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_usages_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_creates_or_updates(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_executes_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_pause(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                         rg_15, rg_16, rg_17, checks=[])
-    step_export_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_pool_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_deletes_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update4(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_rename(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_resume(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[
+        test.check("location", "West US 2", case_sensitive=False),
+        test.check("collation", "", case_sensitive=False),
+        test.check("createMode", "", case_sensitive=False),
+        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("maxSizeBytes", 0),
+        test.check("recoverableDatabaseId", "", case_sensitive=False),
+        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("sourceDatabaseId", "", case_sensitive=False),
+        test.check("sku.name", "", case_sensitive=False),
+        test.check("sku.tier", "", case_sensitive=False),
+        test.check("name", "{mySqlPool2}", case_sensitive=False),
+    ])
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update5(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_managed_identity_sql_control_settings(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_an_ip_firewall_rule_from_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_blob_auditing_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_removes_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_connection_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_data_warehouse_user_activity_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                    rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_geo_backup_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_operation(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_operation_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_remove_a_database_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_sql_pool_replication_link_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_restore_point_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_sql_pool_restore_point_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_schema_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_column_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_usage_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_export(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_big_data_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_hub_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[])
     cleanup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                      rg_15, rg_16, rg_17)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class SynapseScenarioTest(ScenarioTest):
 
-    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5', parameter_name=''
-                           'rg_5')
+    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5',
+                           parameter_name='rg_5')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_ExampleResourceGroup'[:7], key='rg', parameter_name='rg')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_resourceGroup1'[:7], key='rg_2', parameter_name='rg_2')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_sqlcrudtest-6845'[:7], key='rg_3', parameter_name='rg_3')
@@ -514,8 +514,8 @@ class SynapseScenarioTest(ScenarioTest):
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-6852'[:7], key='rg_15', parameter_name='rg_15')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-4799'[:7], key='rg_16', parameter_name='rg_16')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_exampleResourceGroup'[:7], key='rg_17', parameter_name='rg_17')
-    def test_synapse(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                     rg_15, rg_16, rg_17):
+    def test_synapse_Scenario(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_params.py

@@ -564,15 +564,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-vulnerability-assessment-scan initiate-scan') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-security-alert-policy show') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -740,15 +740,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse workspace-managed-identity-sql-control-setting update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse integration-runtime list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -933,24 +933,24 @@ def load_arguments(self, _):
 
     with self.argument_context('synapse private-link-hub show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
 
     with self.argument_context('synapse private-link-hub create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub')
         c.argument('tags', tags_type)
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
 
     with self.argument_context('synapse private-link-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('synapse private-link-hub delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')

src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/tests/latest/test_synapse_scenario.py

@@ -12,109 +12,109 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step_create_or_update_a_workspace
-from .example_steps import step_create_or_update_a_big_data_pool
-from .example_steps import step_list_big_data_pools_in_a_workspace
-from .example_steps import step_update_a_big_data_pool
-from .example_steps import step_create_integration_runtime
-from .example_steps import step_get_integration_runtime
-from .example_steps import step_list_integration_runtimes
-from .example_steps import step_start_integration_runtime
-from .example_steps import step_stop_integration_runtime
-from .example_steps import step_upgrade_integration_runtime
-from .example_steps import step_update_integration_runtime
-from .example_steps import step_list_auth_keys
-from .example_steps import step_regenerate_auth_key
-from .example_steps import step_get_connection_info
-from .example_steps import step_sync_credentials
-from .example_steps import step_get_monitoring_data
-from .example_steps import step_get_integration_runtime_node_ip_address
-from .example_steps import step_get_integration_runtime_node
-from .example_steps import step_update_integration_runtime_node
-from .example_steps import step_get_integration_runtime_object_metadata
-from .example_steps import step_refresh_object_metadata
-from .example_steps import step_get_status
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_list_ip_firewall_rules_in_a_workspace
-from .example_steps import step_replace_all_ip_firewall_rules_in_a_workspace
-from .example_steps import step_get_azure_async_operation_header_result
-from .example_steps import step_get_location_header_result
-from .example_steps import step_approve_private_endpoint_connection
-from .example_steps import step_get_private_endpoint_connection
-from .example_steps import step_list_private_endpoint
-from .example_steps import step_create_or_update_a_privatelinkhub
-from .example_steps import step_get_a_privatelinkhub
-from .example_steps import step_list_privatelinkhubs_in_resource_group
-from .example_steps import step_list_privatelinkhubs_in_subscription
-from .example_steps import step_update_a_privatelinkhub
-from .example_steps import step_get_a_big_data_pool
-from .example_steps import step_get_a_workspace
-from .example_steps import step_list_workspaces_in_resource_group
-from .example_steps import step_list_workspaces_in_subscription
-from .example_steps import step_update_a_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_create_a_sql_analytics_pool
-from .example_steps import step_get_a_sql_analytics_pool
-from .example_steps import step_list_sql_analytics_pools_in_a_workspace
-from .example_steps import step_list_sql_analytics
-from .example_steps import step_pause_a_sql_analytics_pool
-from .example_steps import step_rename_a_sql_analytics_pool
-from .example_steps import step_resume_a_sql_analytics_pool
-from .example_steps import step_update_a_sql_analytics_pool
-from .example_steps import step_create_or_update
-from .example_steps import step_create_or_update2
-from .example_steps import step_get_blob_auditing
-from .example_steps import step_get_a_connection
-from .example_steps import step_get_a_sql_analytics_pool_user_activity
-from .example_steps import step_get_sql_pool_geo_backup_policy
-from .example_steps import step_set_metadata_sync
-from .example_steps import step_get_metadata_sync
-from .example_steps import step_get_the_result
-from .example_steps import step_list_the_sql
-from .example_steps import step_lists_a_sql_analytic_pool_s_replication_links
-from .example_steps import step_get_a_list
-from .example_steps import step_creates_sql_pool_restore_point_
-from .example_steps import step_list_the_schema_in_a_sql_analytics_pool
-from .example_steps import step_update_a_sql
-from .example_steps import step_update_a_sql2
-from .example_steps import step_get_a_security_alert_of_a_sql_analytics_pool
-from .example_steps import step_updates_the_sensitivity
-from .example_steps import step_gets_the_current
-from .example_steps import step_gets_the_recommended
-from .example_steps import step_disables_sensitivity_recommendations
-from .example_steps import step_enables_sensitivity_recommendations
-from .example_steps import step_list_the_columns
-from .example_steps import step_list_the_tables
-from .example_steps import step_create_or_update3
-from .example_steps import step_get_transparent_data
-from .example_steps import step_list_the_usages_of_a_sql_analytics_pool
-from .example_steps import step_creates_or_updates
-from .example_steps import step_get_a_vulnerability
-from .example_steps import step_executes_a_sql
-from .example_steps import step_export_a_database
-from .example_steps import step_create_a_database
-from .example_steps import step_create_a_database2
-from .example_steps import step_create_a_database3
-from .example_steps import step_get_a_sql_pool_s_vulnerability_assessment
-from .example_steps import step_get_a_vulnerability2
-from .example_steps import step_deletes_the_sensitivity
-from .example_steps import step_create_or_update4
-from .example_steps import step_get_workspace_active_directory_admin
-from .example_steps import step_create_or_update5
-from .example_steps import step_get_managed_identity_sql_control_settings
-from .example_steps import step_delete_a_big_data_pool
-from .example_steps import step_delete_integration_runtime_node
-from .example_steps import step_delete_integration_runtime
-from .example_steps import step_delete_an_ip_firewall_rule_from_a_workspace
-from .example_steps import step_delete_private_endpoint_connection
-from .example_steps import step_removes_a_database
-from .example_steps import step_delete_a_privatelinkhub
-from .example_steps import step_remove_a_database_s_vulnerability_assessment
-from .example_steps import step_delete_a_sql_analytics_pool
-from .example_steps import step_delete_workspace_active_directory_admin
-from .example_steps import step_delete_a_workspace
+from .example_steps import step_workspace_create
+from .example_steps import step_big_data_pool_create
+from .example_steps import step_big_data_pool_list
+from .example_steps import step_big_data_pool_update
+from .example_steps import step_integration_runtime_create
+from .example_steps import step_integration_runtime_show
+from .example_steps import step_integration_runtime_list
+from .example_steps import step_integration_runtime_start
+from .example_steps import step_integration_runtime_stop
+from .example_steps import step_integration_runtime_upgrade
+from .example_steps import step_integration_runtime_update
+from .example_steps import step_integration_runtime_auth_key_list
+from .example_steps import step_integration_runtime_auth_key_regenerate
+from .example_steps import step_integration_runtime_connection_info_get
+from .example_steps import step_integration_runtime_credentials_sync
+from .example_steps import step_integration_runtime_monitoring_data_get
+from .example_steps import step_integration_runtime_node_ip_address_get
+from .example_steps import step_integration_runtime_node_show
+from .example_steps import step_integration_runtime_node_update
+from .example_steps import step_integration_runtime_object_metadata_get
+from .example_steps import step_integration_runtime_object_metadata_refresh
+from .example_steps import step_integration_runtime_status_get
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_list
+from .example_steps import step_ip_firewall_rule_replace_all
+from .example_steps import step_operation_get_azure_async_header_result
+from .example_steps import step_operation_get_location_header_result
+from .example_steps import step_private_endpoint_connection_create
+from .example_steps import step_private_endpoint_connection_show
+from .example_steps import step_private_endpoint_connection_list
+from .example_steps import step_private_link_hub_create
+from .example_steps import step_private_link_hub_show
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_update
+from .example_steps import step_big_data_pool_show
+from .example_steps import step_workspace_show
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_update
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_sql_pool_create
+from .example_steps import step_sql_pool_show
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_pause
+from .example_steps import step_sql_pool_rename
+from .example_steps import step_sql_pool_resume
+from .example_steps import step_sql_pool_update
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_show
+from .example_steps import step_sql_pool_connection_policy_show
+from .example_steps import step_sql_pool_data_warehouse_user_activity_show
+from .example_steps import step_sql_pool_geo_backup_policy_show
+from .example_steps import step_sql_pool_metadata_sync_config_create
+from .example_steps import step_sql_pool_metadata_sync_config_show
+from .example_steps import step_sql_pool_operation
+from .example_steps import step_sql_pool_operation_list
+from .example_steps import step_sql_pool_replication_link_list
+from .example_steps import step_sql_pool_restore_point_list
+from .example_steps import step_sql_pool_restore_point_create
+from .example_steps import step_sql_pool_schema_list
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_show
+from .example_steps import step_sql_pool_sensitivity_label_create
+from .example_steps import step_sql_pool_sensitivity_label_list_current
+from .example_steps import step_sql_pool_sensitivity_label_list_recommended
+from .example_steps import step_sql_pool_sensitivity
+from .example_steps import step_sql_pool_sensitivity2
+from .example_steps import step_sql_pool_table_column_list
+from .example_steps import step_sql_pool_table_list
+from .example_steps import step_sql_pool_transparent_data_encryption_create
+from .example_steps import step_sql_pool_transparent_data_encryption_show
+from .example_steps import step_sql_pool_usage_list
+from .example_steps import step_sql_pool_vulnerability
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_list
+from .example_steps import step_sql_pool_vulnerability3
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_export
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_show
+from .example_steps import step_sql_pool_vulnerability_assessment_list
+from .example_steps import step_sql_pool_sensitivity_label_delete
+from .example_steps import step_workspace_aad_admin_create
+from .example_steps import step_workspace_aad_admin_show
+from .example_steps import step_workspace_managed_identity
+from .example_steps import step_workspace_managed_identity2
+from .example_steps import step_big_data_pool_delete
+from .example_steps import step_integration_runtime_node_delete
+from .example_steps import step_integration_runtime_delete
+from .example_steps import step_ip_firewall_rule_delete
+from .example_steps import step_private_endpoint_connection_delete
+from .example_steps import step_sql_pool_vulnerability2
+from .example_steps import step_private_link_hub_delete
+from .example_steps import step_sql_pool_vulnerability_assessment_delete
+from .example_steps import step_sql_pool_delete
+from .example_steps import step_workspace_aad_admin_delete
+from .example_steps import step_workspace_delete
 from .. import (
     try_manual,
     raise_if,
@@ -145,8 +145,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
                   rg_16, rg_17):
     setup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
                    rg_16, rg_17)
-    step_create_or_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_workspace_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "East US", case_sensitive=False),
         test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
@@ -159,8 +159,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myWorkspace2}", case_sensitive=False),
     ])
-    step_create_or_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -176,12 +176,12 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_list_big_data_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -197,102 +197,102 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_create_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_get_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_integration_runtimes(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                   rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_start_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_start(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_stop_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_integration_runtime_stop(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                   rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_upgrade_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_upgrade(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_auth_keys(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_regenerate_auth_key(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_connection_info(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_sync_credentials(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_monitoring_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node_ip_address(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_integration_runtime_auth_key_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_auth_key_regenerate(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_connection_info_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_credentials_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_monitoring_data_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_ip_address_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_refresh(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_status_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_replace_all(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_operation_get_azure_async_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_refresh_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_status(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_replace_all_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_azure_async_operation_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_approve_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_private_endpoint(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_operation_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_private_link_hub_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_create_or_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_get_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_list_privatelinkhubs_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_list_privatelinkhubs_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_private_link_hub_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "East US", case_sensitive=False),
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
     ])
-    step_get_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -307,42 +307,42 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sparkVersion", "2.4", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_get_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_workspace_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                          rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_list_workspaces_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_list_workspaces_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("collation", "", case_sensitive=False),
         test.check("createMode", "", case_sensitive=False),
@@ -355,146 +355,146 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sku.tier", "", case_sensitive=False),
         test.check("name", "{mySqlPool2}", case_sensitive=False),
     ])
-    step_get_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_pause_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_rename_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_resume_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "West US 2", case_sensitive=False),
-        test.check("collation", "", case_sensitive=False),
-        test.check("createMode", "", case_sensitive=False),
-        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("maxSizeBytes", 0),
-        test.check("recoverableDatabaseId", "", case_sensitive=False),
-        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("sourceDatabaseId", "", case_sensitive=False),
-        test.check("sku.name", "", case_sensitive=False),
-        test.check("sku.tier", "", case_sensitive=False),
-        test.check("name", "{mySqlPool2}", case_sensitive=False),
-    ])
-    step_create_or_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_blob_auditing(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_a_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_analytics_pool_user_activity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_sql_pool_geo_backup_policy(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_set_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_the_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_list_the_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_lists_a_sql_analytic_pool_s_replication_links(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_creates_sql_pool_restore_point_(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_schema_in_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                        rg_15, rg_16, rg_17, checks=[])
-    step_get_a_security_alert_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_updates_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_disables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_enables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_columns(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_list_the_tables(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                         rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_transparent_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_usages_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_creates_or_updates(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_executes_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_pause(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                         rg_15, rg_16, rg_17, checks=[])
-    step_export_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_pool_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_deletes_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update4(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_rename(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_resume(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[
+        test.check("location", "West US 2", case_sensitive=False),
+        test.check("collation", "", case_sensitive=False),
+        test.check("createMode", "", case_sensitive=False),
+        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("maxSizeBytes", 0),
+        test.check("recoverableDatabaseId", "", case_sensitive=False),
+        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("sourceDatabaseId", "", case_sensitive=False),
+        test.check("sku.name", "", case_sensitive=False),
+        test.check("sku.tier", "", case_sensitive=False),
+        test.check("name", "{mySqlPool2}", case_sensitive=False),
+    ])
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update5(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_managed_identity_sql_control_settings(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_an_ip_firewall_rule_from_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_blob_auditing_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_removes_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_connection_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_data_warehouse_user_activity_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                    rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_geo_backup_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_operation(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_operation_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_remove_a_database_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_sql_pool_replication_link_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_restore_point_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_sql_pool_restore_point_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_schema_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_column_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_usage_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_export(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_big_data_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_hub_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[])
     cleanup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                      rg_15, rg_16, rg_17)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class SynapseScenarioTest(ScenarioTest):
 
-    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5', parameter_name=''
-                           'rg_5')
+    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5',
+                           parameter_name='rg_5')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_ExampleResourceGroup'[:7], key='rg', parameter_name='rg')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_resourceGroup1'[:7], key='rg_2', parameter_name='rg_2')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_sqlcrudtest-6845'[:7], key='rg_3', parameter_name='rg_3')
@@ -514,8 +514,8 @@ class SynapseScenarioTest(ScenarioTest):
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-6852'[:7], key='rg_15', parameter_name='rg_15')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-4799'[:7], key='rg_16', parameter_name='rg_16')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_exampleResourceGroup'[:7], key='rg_17', parameter_name='rg_17')
-    def test_synapse(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                     rg_15, rg_16, rg_17):
+    def test_synapse_Scenario(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/synapse/output/extnosdk/src/synapse/azext_synapse/generated/_params.py

@@ -564,15 +564,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-vulnerability-assessment-scan initiate-scan') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-security-alert-policy show') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -740,15 +740,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse workspace-managed-identity-sql-control-setting update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse integration-runtime list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -933,24 +933,24 @@ def load_arguments(self, _):
 
     with self.argument_context('synapse private-link-hub show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
 
     with self.argument_context('synapse private-link-hub create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub')
         c.argument('tags', tags_type)
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
 
     with self.argument_context('synapse private-link-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('synapse private-link-hub delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')

src/test/scenarios/synapse/output/extnosdk/src/synapse/azext_synapse/tests/latest/test_synapse_scenario.py

@@ -12,109 +12,109 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step_create_or_update_a_workspace
-from .example_steps import step_create_or_update_a_big_data_pool
-from .example_steps import step_list_big_data_pools_in_a_workspace
-from .example_steps import step_update_a_big_data_pool
-from .example_steps import step_create_integration_runtime
-from .example_steps import step_get_integration_runtime
-from .example_steps import step_list_integration_runtimes
-from .example_steps import step_start_integration_runtime
-from .example_steps import step_stop_integration_runtime
-from .example_steps import step_upgrade_integration_runtime
-from .example_steps import step_update_integration_runtime
-from .example_steps import step_list_auth_keys
-from .example_steps import step_regenerate_auth_key
-from .example_steps import step_get_connection_info
-from .example_steps import step_sync_credentials
-from .example_steps import step_get_monitoring_data
-from .example_steps import step_get_integration_runtime_node_ip_address
-from .example_steps import step_get_integration_runtime_node
-from .example_steps import step_update_integration_runtime_node
-from .example_steps import step_get_integration_runtime_object_metadata
-from .example_steps import step_refresh_object_metadata
-from .example_steps import step_get_status
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_list_ip_firewall_rules_in_a_workspace
-from .example_steps import step_replace_all_ip_firewall_rules_in_a_workspace
-from .example_steps import step_get_azure_async_operation_header_result
-from .example_steps import step_get_location_header_result
-from .example_steps import step_approve_private_endpoint_connection
-from .example_steps import step_get_private_endpoint_connection
-from .example_steps import step_list_private_endpoint
-from .example_steps import step_create_or_update_a_privatelinkhub
-from .example_steps import step_get_a_privatelinkhub
-from .example_steps import step_list_privatelinkhubs_in_resource_group
-from .example_steps import step_list_privatelinkhubs_in_subscription
-from .example_steps import step_update_a_privatelinkhub
-from .example_steps import step_get_a_big_data_pool
-from .example_steps import step_get_a_workspace
-from .example_steps import step_list_workspaces_in_resource_group
-from .example_steps import step_list_workspaces_in_subscription
-from .example_steps import step_update_a_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_create_a_sql_analytics_pool
-from .example_steps import step_get_a_sql_analytics_pool
-from .example_steps import step_list_sql_analytics_pools_in_a_workspace
-from .example_steps import step_list_sql_analytics
-from .example_steps import step_pause_a_sql_analytics_pool
-from .example_steps import step_rename_a_sql_analytics_pool
-from .example_steps import step_resume_a_sql_analytics_pool
-from .example_steps import step_update_a_sql_analytics_pool
-from .example_steps import step_create_or_update
-from .example_steps import step_create_or_update2
-from .example_steps import step_get_blob_auditing
-from .example_steps import step_get_a_connection
-from .example_steps import step_get_a_sql_analytics_pool_user_activity
-from .example_steps import step_get_sql_pool_geo_backup_policy
-from .example_steps import step_set_metadata_sync
-from .example_steps import step_get_metadata_sync
-from .example_steps import step_get_the_result
-from .example_steps import step_list_the_sql
-from .example_steps import step_lists_a_sql_analytic_pool_s_replication_links
-from .example_steps import step_get_a_list
-from .example_steps import step_creates_sql_pool_restore_point_
-from .example_steps import step_list_the_schema_in_a_sql_analytics_pool
-from .example_steps import step_update_a_sql
-from .example_steps import step_update_a_sql2
-from .example_steps import step_get_a_security_alert_of_a_sql_analytics_pool
-from .example_steps import step_updates_the_sensitivity
-from .example_steps import step_gets_the_current
-from .example_steps import step_gets_the_recommended
-from .example_steps import step_disables_sensitivity_recommendations
-from .example_steps import step_enables_sensitivity_recommendations
-from .example_steps import step_list_the_columns
-from .example_steps import step_list_the_tables
-from .example_steps import step_create_or_update3
-from .example_steps import step_get_transparent_data
-from .example_steps import step_list_the_usages_of_a_sql_analytics_pool
-from .example_steps import step_creates_or_updates
-from .example_steps import step_get_a_vulnerability
-from .example_steps import step_executes_a_sql
-from .example_steps import step_export_a_database
-from .example_steps import step_create_a_database
-from .example_steps import step_create_a_database2
-from .example_steps import step_create_a_database3
-from .example_steps import step_get_a_sql_pool_s_vulnerability_assessment
-from .example_steps import step_get_a_vulnerability2
-from .example_steps import step_deletes_the_sensitivity
-from .example_steps import step_create_or_update4
-from .example_steps import step_get_workspace_active_directory_admin
-from .example_steps import step_create_or_update5
-from .example_steps import step_get_managed_identity_sql_control_settings
-from .example_steps import step_delete_a_big_data_pool
-from .example_steps import step_delete_integration_runtime_node
-from .example_steps import step_delete_integration_runtime
-from .example_steps import step_delete_an_ip_firewall_rule_from_a_workspace
-from .example_steps import step_delete_private_endpoint_connection
-from .example_steps import step_removes_a_database
-from .example_steps import step_delete_a_privatelinkhub
-from .example_steps import step_remove_a_database_s_vulnerability_assessment
-from .example_steps import step_delete_a_sql_analytics_pool
-from .example_steps import step_delete_workspace_active_directory_admin
-from .example_steps import step_delete_a_workspace
+from .example_steps import step_workspace_create
+from .example_steps import step_big_data_pool_create
+from .example_steps import step_big_data_pool_list
+from .example_steps import step_big_data_pool_update
+from .example_steps import step_integration_runtime_create
+from .example_steps import step_integration_runtime_show
+from .example_steps import step_integration_runtime_list
+from .example_steps import step_integration_runtime_start
+from .example_steps import step_integration_runtime_stop
+from .example_steps import step_integration_runtime_upgrade
+from .example_steps import step_integration_runtime_update
+from .example_steps import step_integration_runtime_auth_key_list
+from .example_steps import step_integration_runtime_auth_key_regenerate
+from .example_steps import step_integration_runtime_connection_info_get
+from .example_steps import step_integration_runtime_credentials_sync
+from .example_steps import step_integration_runtime_monitoring_data_get
+from .example_steps import step_integration_runtime_node_ip_address_get
+from .example_steps import step_integration_runtime_node_show
+from .example_steps import step_integration_runtime_node_update
+from .example_steps import step_integration_runtime_object_metadata_get
+from .example_steps import step_integration_runtime_object_metadata_refresh
+from .example_steps import step_integration_runtime_status_get
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_list
+from .example_steps import step_ip_firewall_rule_replace_all
+from .example_steps import step_operation_get_azure_async_header_result
+from .example_steps import step_operation_get_location_header_result
+from .example_steps import step_private_endpoint_connection_create
+from .example_steps import step_private_endpoint_connection_show
+from .example_steps import step_private_endpoint_connection_list
+from .example_steps import step_private_link_hub_create
+from .example_steps import step_private_link_hub_show
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_update
+from .example_steps import step_big_data_pool_show
+from .example_steps import step_workspace_show
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_update
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_sql_pool_create
+from .example_steps import step_sql_pool_show
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_pause
+from .example_steps import step_sql_pool_rename
+from .example_steps import step_sql_pool_resume
+from .example_steps import step_sql_pool_update
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_show
+from .example_steps import step_sql_pool_connection_policy_show
+from .example_steps import step_sql_pool_data_warehouse_user_activity_show
+from .example_steps import step_sql_pool_geo_backup_policy_show
+from .example_steps import step_sql_pool_metadata_sync_config_create
+from .example_steps import step_sql_pool_metadata_sync_config_show
+from .example_steps import step_sql_pool_operation
+from .example_steps import step_sql_pool_operation_list
+from .example_steps import step_sql_pool_replication_link_list
+from .example_steps import step_sql_pool_restore_point_list
+from .example_steps import step_sql_pool_restore_point_create
+from .example_steps import step_sql_pool_schema_list
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_show
+from .example_steps import step_sql_pool_sensitivity_label_create
+from .example_steps import step_sql_pool_sensitivity_label_list_current
+from .example_steps import step_sql_pool_sensitivity_label_list_recommended
+from .example_steps import step_sql_pool_sensitivity
+from .example_steps import step_sql_pool_sensitivity2
+from .example_steps import step_sql_pool_table_column_list
+from .example_steps import step_sql_pool_table_list
+from .example_steps import step_sql_pool_transparent_data_encryption_create
+from .example_steps import step_sql_pool_transparent_data_encryption_show
+from .example_steps import step_sql_pool_usage_list
+from .example_steps import step_sql_pool_vulnerability
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_list
+from .example_steps import step_sql_pool_vulnerability3
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_export
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_show
+from .example_steps import step_sql_pool_vulnerability_assessment_list
+from .example_steps import step_sql_pool_sensitivity_label_delete
+from .example_steps import step_workspace_aad_admin_create
+from .example_steps import step_workspace_aad_admin_show
+from .example_steps import step_workspace_managed_identity
+from .example_steps import step_workspace_managed_identity2
+from .example_steps import step_big_data_pool_delete
+from .example_steps import step_integration_runtime_node_delete
+from .example_steps import step_integration_runtime_delete
+from .example_steps import step_ip_firewall_rule_delete
+from .example_steps import step_private_endpoint_connection_delete
+from .example_steps import step_sql_pool_vulnerability2
+from .example_steps import step_private_link_hub_delete
+from .example_steps import step_sql_pool_vulnerability_assessment_delete
+from .example_steps import step_sql_pool_delete
+from .example_steps import step_workspace_aad_admin_delete
+from .example_steps import step_workspace_delete
 from .. import (
     try_manual,
     raise_if,
@@ -145,8 +145,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
                   rg_16, rg_17):
     setup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
                    rg_16, rg_17)
-    step_create_or_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_workspace_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "East US", case_sensitive=False),
         test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
@@ -159,8 +159,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myWorkspace2}", case_sensitive=False),
     ])
-    step_create_or_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -176,12 +176,12 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_list_big_data_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -197,102 +197,102 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_create_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_get_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_integration_runtimes(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                   rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_start_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_start(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_stop_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_integration_runtime_stop(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                   rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_upgrade_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_upgrade(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_auth_keys(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_regenerate_auth_key(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_connection_info(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_sync_credentials(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_monitoring_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node_ip_address(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_integration_runtime_auth_key_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_auth_key_regenerate(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_connection_info_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_credentials_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_monitoring_data_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_ip_address_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_refresh(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_status_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_replace_all(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_operation_get_azure_async_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_refresh_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_status(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_replace_all_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_azure_async_operation_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_approve_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_private_endpoint(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_operation_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_private_link_hub_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_create_or_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_get_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_list_privatelinkhubs_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_list_privatelinkhubs_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_private_link_hub_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "East US", case_sensitive=False),
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
     ])
-    step_get_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -307,42 +307,42 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sparkVersion", "2.4", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_get_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_workspace_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                          rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_list_workspaces_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_list_workspaces_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("collation", "", case_sensitive=False),
         test.check("createMode", "", case_sensitive=False),
@@ -355,146 +355,146 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sku.tier", "", case_sensitive=False),
         test.check("name", "{mySqlPool2}", case_sensitive=False),
     ])
-    step_get_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_pause_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_rename_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_resume_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "West US 2", case_sensitive=False),
-        test.check("collation", "", case_sensitive=False),
-        test.check("createMode", "", case_sensitive=False),
-        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("maxSizeBytes", 0),
-        test.check("recoverableDatabaseId", "", case_sensitive=False),
-        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("sourceDatabaseId", "", case_sensitive=False),
-        test.check("sku.name", "", case_sensitive=False),
-        test.check("sku.tier", "", case_sensitive=False),
-        test.check("name", "{mySqlPool2}", case_sensitive=False),
-    ])
-    step_create_or_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_blob_auditing(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_a_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_analytics_pool_user_activity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_sql_pool_geo_backup_policy(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_set_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_the_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_list_the_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_lists_a_sql_analytic_pool_s_replication_links(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_creates_sql_pool_restore_point_(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_schema_in_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                        rg_15, rg_16, rg_17, checks=[])
-    step_get_a_security_alert_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_updates_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_disables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_enables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_columns(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_list_the_tables(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                         rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_transparent_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_usages_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_creates_or_updates(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_executes_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_pause(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                         rg_15, rg_16, rg_17, checks=[])
-    step_export_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_pool_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_deletes_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update4(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_rename(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_resume(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[
+        test.check("location", "West US 2", case_sensitive=False),
+        test.check("collation", "", case_sensitive=False),
+        test.check("createMode", "", case_sensitive=False),
+        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("maxSizeBytes", 0),
+        test.check("recoverableDatabaseId", "", case_sensitive=False),
+        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("sourceDatabaseId", "", case_sensitive=False),
+        test.check("sku.name", "", case_sensitive=False),
+        test.check("sku.tier", "", case_sensitive=False),
+        test.check("name", "{mySqlPool2}", case_sensitive=False),
+    ])
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update5(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_managed_identity_sql_control_settings(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_an_ip_firewall_rule_from_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_blob_auditing_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_removes_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_connection_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_data_warehouse_user_activity_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                    rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_geo_backup_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_operation(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_operation_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_remove_a_database_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_sql_pool_replication_link_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_restore_point_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_sql_pool_restore_point_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_schema_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_column_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_usage_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_export(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_big_data_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_hub_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[])
     cleanup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                      rg_15, rg_16, rg_17)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class SynapseScenarioTest(ScenarioTest):
 
-    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5', parameter_name=''
-                           'rg_5')
+    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5',
+                           parameter_name='rg_5')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_ExampleResourceGroup'[:7], key='rg', parameter_name='rg')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_resourceGroup1'[:7], key='rg_2', parameter_name='rg_2')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_sqlcrudtest-6845'[:7], key='rg_3', parameter_name='rg_3')
@@ -514,8 +514,8 @@ class SynapseScenarioTest(ScenarioTest):
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-6852'[:7], key='rg_15', parameter_name='rg_15')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-4799'[:7], key='rg_16', parameter_name='rg_16')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_exampleResourceGroup'[:7], key='rg_17', parameter_name='rg_17')
-    def test_synapse(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                     rg_15, rg_16, rg_17):
+    def test_synapse_Scenario(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/test/scenarios/synapse/output/extnosdknoflattentrack1/src/synapse/azext_synapse/generated/_params.py

@@ -564,15 +564,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-vulnerability-assessment-scan initiate-scan') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('sql_pool_name', type=str, help='SQL pool name', id_part='child_name_1')
-        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.', id_part=''
-                   'child_name_3')
+        c.argument('scan_id', type=str, help='The vulnerability assessment scan Id of the scan to retrieve.',
+                   id_part='child_name_3')
 
     with self.argument_context('synapse sql-pool-security-alert-policy show') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -740,15 +740,15 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse workspace-managed-identity-sql-control-setting update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('workspace_name', type=str, help='The name of the workspace', id_part='name')
         c.argument('grant_sql_control_to_managed_identity_desired_state', arg_type=get_enum_type(['Enabled',
-                                                                                                  'Disabled']), help=''
-                   'Desired state')
+                                                                                                  'Disabled']),
+                   help='Desired state')
 
     with self.argument_context('synapse integration-runtime list') as c:
         c.argument('resource_group_name', resource_group_name_type)
@@ -933,24 +933,24 @@ def load_arguments(self, _):
 
     with self.argument_context('synapse private-link-hub show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
 
     with self.argument_context('synapse private-link-hub create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub')
         c.argument('tags', tags_type)
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
 
     with self.argument_context('synapse private-link-hub update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('synapse private-link-hub delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str, help=''
-                   'The name of the privateLinkHub', id_part='name')
+        c.argument('private_link_hub_name', options_list=['--name', '-n', '--private-link-hub-name'], type=str,
+                   help='The name of the privateLinkHub', id_part='name')

src/test/scenarios/synapse/output/extnosdknoflattentrack1/src/synapse/azext_synapse/tests/latest/test_synapse_scenario.py

@@ -12,109 +12,109 @@
 import os
 from azure.cli.testsdk import ScenarioTest
 from azure.cli.testsdk import ResourceGroupPreparer
-from .example_steps import step_create_or_update_a_workspace
-from .example_steps import step_create_or_update_a_big_data_pool
-from .example_steps import step_list_big_data_pools_in_a_workspace
-from .example_steps import step_update_a_big_data_pool
-from .example_steps import step_create_integration_runtime
-from .example_steps import step_get_integration_runtime
-from .example_steps import step_list_integration_runtimes
-from .example_steps import step_start_integration_runtime
-from .example_steps import step_stop_integration_runtime
-from .example_steps import step_upgrade_integration_runtime
-from .example_steps import step_update_integration_runtime
-from .example_steps import step_list_auth_keys
-from .example_steps import step_regenerate_auth_key
-from .example_steps import step_get_connection_info
-from .example_steps import step_sync_credentials
-from .example_steps import step_get_monitoring_data
-from .example_steps import step_get_integration_runtime_node_ip_address
-from .example_steps import step_get_integration_runtime_node
-from .example_steps import step_update_integration_runtime_node
-from .example_steps import step_get_integration_runtime_object_metadata
-from .example_steps import step_refresh_object_metadata
-from .example_steps import step_get_status
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_create_an_ip_firewall_rule
-from .example_steps import step_list_ip_firewall_rules_in_a_workspace
-from .example_steps import step_replace_all_ip_firewall_rules_in_a_workspace
-from .example_steps import step_get_azure_async_operation_header_result
-from .example_steps import step_get_location_header_result
-from .example_steps import step_approve_private_endpoint_connection
-from .example_steps import step_get_private_endpoint_connection
-from .example_steps import step_list_private_endpoint
-from .example_steps import step_create_or_update_a_privatelinkhub
-from .example_steps import step_get_a_privatelinkhub
-from .example_steps import step_list_privatelinkhubs_in_resource_group
-from .example_steps import step_list_privatelinkhubs_in_subscription
-from .example_steps import step_update_a_privatelinkhub
-from .example_steps import step_get_a_big_data_pool
-from .example_steps import step_get_a_workspace
-from .example_steps import step_list_workspaces_in_resource_group
-from .example_steps import step_list_workspaces_in_subscription
-from .example_steps import step_update_a_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_get_private_link_resources_for_workspace
-from .example_steps import step_create_a_sql_analytics_pool
-from .example_steps import step_get_a_sql_analytics_pool
-from .example_steps import step_list_sql_analytics_pools_in_a_workspace
-from .example_steps import step_list_sql_analytics
-from .example_steps import step_pause_a_sql_analytics_pool
-from .example_steps import step_rename_a_sql_analytics_pool
-from .example_steps import step_resume_a_sql_analytics_pool
-from .example_steps import step_update_a_sql_analytics_pool
-from .example_steps import step_create_or_update
-from .example_steps import step_create_or_update2
-from .example_steps import step_get_blob_auditing
-from .example_steps import step_get_a_connection
-from .example_steps import step_get_a_sql_analytics_pool_user_activity
-from .example_steps import step_get_sql_pool_geo_backup_policy
-from .example_steps import step_set_metadata_sync
-from .example_steps import step_get_metadata_sync
-from .example_steps import step_get_the_result
-from .example_steps import step_list_the_sql
-from .example_steps import step_lists_a_sql_analytic_pool_s_replication_links
-from .example_steps import step_get_a_list
-from .example_steps import step_creates_sql_pool_restore_point_
-from .example_steps import step_list_the_schema_in_a_sql_analytics_pool
-from .example_steps import step_update_a_sql
-from .example_steps import step_update_a_sql2
-from .example_steps import step_get_a_security_alert_of_a_sql_analytics_pool
-from .example_steps import step_updates_the_sensitivity
-from .example_steps import step_gets_the_current
-from .example_steps import step_gets_the_recommended
-from .example_steps import step_disables_sensitivity_recommendations
-from .example_steps import step_enables_sensitivity_recommendations
-from .example_steps import step_list_the_columns
-from .example_steps import step_list_the_tables
-from .example_steps import step_create_or_update3
-from .example_steps import step_get_transparent_data
-from .example_steps import step_list_the_usages_of_a_sql_analytics_pool
-from .example_steps import step_creates_or_updates
-from .example_steps import step_get_a_vulnerability
-from .example_steps import step_executes_a_sql
-from .example_steps import step_export_a_database
-from .example_steps import step_create_a_database
-from .example_steps import step_create_a_database2
-from .example_steps import step_create_a_database3
-from .example_steps import step_get_a_sql_pool_s_vulnerability_assessment
-from .example_steps import step_get_a_vulnerability2
-from .example_steps import step_deletes_the_sensitivity
-from .example_steps import step_create_or_update4
-from .example_steps import step_get_workspace_active_directory_admin
-from .example_steps import step_create_or_update5
-from .example_steps import step_get_managed_identity_sql_control_settings
-from .example_steps import step_delete_a_big_data_pool
-from .example_steps import step_delete_integration_runtime_node
-from .example_steps import step_delete_integration_runtime
-from .example_steps import step_delete_an_ip_firewall_rule_from_a_workspace
-from .example_steps import step_delete_private_endpoint_connection
-from .example_steps import step_removes_a_database
-from .example_steps import step_delete_a_privatelinkhub
-from .example_steps import step_remove_a_database_s_vulnerability_assessment
-from .example_steps import step_delete_a_sql_analytics_pool
-from .example_steps import step_delete_workspace_active_directory_admin
-from .example_steps import step_delete_a_workspace
+from .example_steps import step_workspace_create
+from .example_steps import step_big_data_pool_create
+from .example_steps import step_big_data_pool_list
+from .example_steps import step_big_data_pool_update
+from .example_steps import step_integration_runtime_create
+from .example_steps import step_integration_runtime_show
+from .example_steps import step_integration_runtime_list
+from .example_steps import step_integration_runtime_start
+from .example_steps import step_integration_runtime_stop
+from .example_steps import step_integration_runtime_upgrade
+from .example_steps import step_integration_runtime_update
+from .example_steps import step_integration_runtime_auth_key_list
+from .example_steps import step_integration_runtime_auth_key_regenerate
+from .example_steps import step_integration_runtime_connection_info_get
+from .example_steps import step_integration_runtime_credentials_sync
+from .example_steps import step_integration_runtime_monitoring_data_get
+from .example_steps import step_integration_runtime_node_ip_address_get
+from .example_steps import step_integration_runtime_node_show
+from .example_steps import step_integration_runtime_node_update
+from .example_steps import step_integration_runtime_object_metadata_get
+from .example_steps import step_integration_runtime_object_metadata_refresh
+from .example_steps import step_integration_runtime_status_get
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_show
+from .example_steps import step_ip_firewall_rule_list
+from .example_steps import step_ip_firewall_rule_replace_all
+from .example_steps import step_operation_get_azure_async_header_result
+from .example_steps import step_operation_get_location_header_result
+from .example_steps import step_private_endpoint_connection_create
+from .example_steps import step_private_endpoint_connection_show
+from .example_steps import step_private_endpoint_connection_list
+from .example_steps import step_private_link_hub_create
+from .example_steps import step_private_link_hub_show
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_list
+from .example_steps import step_private_link_hub_update
+from .example_steps import step_big_data_pool_show
+from .example_steps import step_workspace_show
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_list
+from .example_steps import step_workspace_update
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_private_link_resource_list
+from .example_steps import step_sql_pool_create
+from .example_steps import step_sql_pool_show
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_list
+from .example_steps import step_sql_pool_pause
+from .example_steps import step_sql_pool_rename
+from .example_steps import step_sql_pool_resume
+from .example_steps import step_sql_pool_update
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_create
+from .example_steps import step_sql_pool_blob_auditing_policy_show
+from .example_steps import step_sql_pool_connection_policy_show
+from .example_steps import step_sql_pool_data_warehouse_user_activity_show
+from .example_steps import step_sql_pool_geo_backup_policy_show
+from .example_steps import step_sql_pool_metadata_sync_config_create
+from .example_steps import step_sql_pool_metadata_sync_config_show
+from .example_steps import step_sql_pool_operation
+from .example_steps import step_sql_pool_operation_list
+from .example_steps import step_sql_pool_replication_link_list
+from .example_steps import step_sql_pool_restore_point_list
+from .example_steps import step_sql_pool_restore_point_create
+from .example_steps import step_sql_pool_schema_list
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_create
+from .example_steps import step_sql_pool_security_alert_policy_show
+from .example_steps import step_sql_pool_sensitivity_label_create
+from .example_steps import step_sql_pool_sensitivity_label_list_current
+from .example_steps import step_sql_pool_sensitivity_label_list_recommended
+from .example_steps import step_sql_pool_sensitivity
+from .example_steps import step_sql_pool_sensitivity2
+from .example_steps import step_sql_pool_table_column_list
+from .example_steps import step_sql_pool_table_list
+from .example_steps import step_sql_pool_transparent_data_encryption_create
+from .example_steps import step_sql_pool_transparent_data_encryption_show
+from .example_steps import step_sql_pool_usage_list
+from .example_steps import step_sql_pool_vulnerability
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_list
+from .example_steps import step_sql_pool_vulnerability3
+from .example_steps import step_sql_pool_vulnerability_assessment_scan_export
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_create
+from .example_steps import step_sql_pool_vulnerability_assessment_show
+from .example_steps import step_sql_pool_vulnerability_assessment_list
+from .example_steps import step_sql_pool_sensitivity_label_delete
+from .example_steps import step_workspace_aad_admin_create
+from .example_steps import step_workspace_aad_admin_show
+from .example_steps import step_workspace_managed_identity
+from .example_steps import step_workspace_managed_identity2
+from .example_steps import step_big_data_pool_delete
+from .example_steps import step_integration_runtime_node_delete
+from .example_steps import step_integration_runtime_delete
+from .example_steps import step_ip_firewall_rule_delete
+from .example_steps import step_private_endpoint_connection_delete
+from .example_steps import step_sql_pool_vulnerability2
+from .example_steps import step_private_link_hub_delete
+from .example_steps import step_sql_pool_vulnerability_assessment_delete
+from .example_steps import step_sql_pool_delete
+from .example_steps import step_workspace_aad_admin_delete
+from .example_steps import step_workspace_delete
 from .. import (
     try_manual,
     raise_if,
@@ -145,8 +145,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
                   rg_16, rg_17):
     setup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
                    rg_16, rg_17)
-    step_create_or_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_workspace_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
         test.check("identity.type", "SystemAssigned", case_sensitive=False),
         test.check("location", "East US", case_sensitive=False),
         test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
@@ -159,8 +159,8 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myWorkspace2}", case_sensitive=False),
     ])
-    step_create_or_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -176,12 +176,12 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_list_big_data_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_update_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -197,102 +197,102 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_create_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_get_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("properties.type", "SelfHosted", case_sensitive=False),
         test.check("properties.description", "A selfhosted integration runtime", case_sensitive=False),
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_integration_runtimes(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                   rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_integration_runtime_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_start_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_start(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_stop_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_integration_runtime_stop(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                   rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_upgrade_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_upgrade(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("name", "{myIntegrationRuntime}", case_sensitive=False),
     ])
-    step_list_auth_keys(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_regenerate_auth_key(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_connection_info(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_sync_credentials(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_monitoring_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node_ip_address(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_integration_runtime_auth_key_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_auth_key_regenerate(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_integration_runtime_connection_info_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_credentials_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_monitoring_data_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_ip_address_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_object_metadata_refresh(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_status_get(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_replace_all(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_integration_runtime_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_operation_get_azure_async_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_refresh_object_metadata(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_status(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_an_ip_firewall_rule(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_replace_all_ip_firewall_rules_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_azure_async_operation_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_approve_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_private_endpoint(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_operation_get_location_header_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                          rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_private_link_hub_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
+    ])
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_create_or_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_get_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
-    ])
-    step_list_privatelinkhubs_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
+    step_private_link_hub_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[
         test.check('length(@)', 1),
     ])
-    step_list_privatelinkhubs_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_private_link_hub_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "East US", case_sensitive=False),
         test.check("tags.key", "value", case_sensitive=False),
         test.check("name", "{myPrivateLinkHub}", case_sensitive=False),
     ])
-    step_get_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[
+    step_big_data_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                            rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("autoPause.delayInMinutes", 15),
         test.check("autoPause.enabled", True),
@@ -307,42 +307,42 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sparkVersion", "2.4", case_sensitive=False),
         test.check("name", "{myBigDataPool}", case_sensitive=False),
     ])
-    step_get_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_workspace_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                        rg_15, rg_16, rg_17, checks=[
+        test.check('length(@)', 1),
+    ])
+    step_workspace_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[
+        test.check("location", "East US", case_sensitive=False),
+        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
+                   case_sensitive=False),
+        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
+        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
+        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
+        test.check("tags.key", "value", case_sensitive=False),
+        test.check("name", "{myWorkspace2}", case_sensitive=False),
+    ])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_resource_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                          rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_list_workspaces_in_resource_group(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_list_workspaces_in_subscription(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check('length(@)', 1),
-    ])
-    step_update_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "East US", case_sensitive=False),
-        test.check("defaultDataLakeStorage.accountUrl", "https://accountname.dfs.core.windows.net",
-                   case_sensitive=False),
-        test.check("defaultDataLakeStorage.filesystem", "default", case_sensitive=False),
-        test.check("sqlAdministratorLogin", "login", case_sensitive=False),
-        test.check("sqlAdministratorLoginPassword", "password", case_sensitive=False),
-        test.check("tags.key", "value", case_sensitive=False),
-        test.check("name", "{myWorkspace2}", case_sensitive=False),
-    ])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_private_link_resources_for_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
         test.check("location", "West US 2", case_sensitive=False),
         test.check("collation", "", case_sensitive=False),
         test.check("createMode", "", case_sensitive=False),
@@ -355,146 +355,146 @@ def call_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_1
         test.check("sku.tier", "", case_sensitive=False),
         test.check("name", "{mySqlPool2}", case_sensitive=False),
     ])
-    step_get_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics_pools_in_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_sql_analytics(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_pause_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_rename_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_resume_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[
-        test.check("location", "West US 2", case_sensitive=False),
-        test.check("collation", "", case_sensitive=False),
-        test.check("createMode", "", case_sensitive=False),
-        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("maxSizeBytes", 0),
-        test.check("recoverableDatabaseId", "", case_sensitive=False),
-        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
-        test.check("sourceDatabaseId", "", case_sensitive=False),
-        test.check("sku.name", "", case_sensitive=False),
-        test.check("sku.tier", "", case_sensitive=False),
-        test.check("name", "{mySqlPool2}", case_sensitive=False),
-    ])
-    step_create_or_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_blob_auditing(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_a_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_analytics_pool_user_activity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_sql_pool_geo_backup_policy(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_set_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_metadata_sync(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_the_result(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                        rg_15, rg_16, rg_17, checks=[])
-    step_list_the_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_lists_a_sql_analytic_pool_s_replication_links(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14, rg_15,
-                    rg_16, rg_17, checks=[])
-    step_creates_sql_pool_restore_point_(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_schema_in_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                      rg_15, rg_16, rg_17, checks=[])
-    step_update_a_sql2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                        rg_15, rg_16, rg_17, checks=[])
-    step_get_a_security_alert_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_updates_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_gets_the_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_disables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_enables_sensitivity_recommendations(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
-                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_columns(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                          rg_15, rg_16, rg_17, checks=[])
-    step_list_the_tables(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                         rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_transparent_data(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_list_the_usages_of_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                 rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_creates_or_updates(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_executes_a_sql(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                       rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_pause(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                         rg_15, rg_16, rg_17, checks=[])
-    step_export_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_a_database3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_sql_pool_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_get_a_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                              rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_deletes_the_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                 rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update4(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_rename(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_resume(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_update(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[
+        test.check("location", "West US 2", case_sensitive=False),
+        test.check("collation", "", case_sensitive=False),
+        test.check("createMode", "", case_sensitive=False),
+        test.check("creationDate", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("maxSizeBytes", 0),
+        test.check("recoverableDatabaseId", "", case_sensitive=False),
+        test.check("restorePointInTime", "1970-01-01T00:00:00.000Z", case_sensitive=False),
+        test.check("sourceDatabaseId", "", case_sensitive=False),
+        test.check("sku.name", "", case_sensitive=False),
+        test.check("sku.tier", "", case_sensitive=False),
+        test.check("name", "{mySqlPool2}", case_sensitive=False),
+    ])
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_create_or_update5(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                           rg_15, rg_16, rg_17, checks=[])
-    step_get_managed_identity_sql_control_settings(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_big_data_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                                rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime_node(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_integration_runtime(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
-                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_an_ip_firewall_rule_from_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_private_endpoint_connection(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+    step_sql_pool_blob_auditing_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_blob_auditing_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_removes_a_database(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_connection_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_data_warehouse_user_activity_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                    rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_geo_backup_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                              rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_metadata_sync_config_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_operation(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                             rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_privatelinkhub(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+    step_sql_pool_operation_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
                                  rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_remove_a_database_s_vulnerability_assessment(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
-                                                      rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_sql_analytics_pool(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+    step_sql_pool_replication_link_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                        rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_restore_point_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
                                      rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_workspace_active_directory_admin(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+    step_sql_pool_restore_point_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                       rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_schema_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                               rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_security_alert_policy_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                             rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_current(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
-    step_delete_a_workspace(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
-                            rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_list_recommended(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                               rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_column_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_table_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_transparent_data_encryption_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                   rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_usage_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                             rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                     rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability3(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_scan_export(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                       rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_list(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                                rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_sensitivity_label_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                           rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_create(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_show(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                  rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_managed_identity2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                     rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_big_data_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_node_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                         rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_integration_runtime_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_ip_firewall_rule_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_endpoint_connection_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11,
+                                            rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability2(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_private_link_hub_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                                 rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_vulnerability_assessment_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10,
+                                                  rg_11, rg_12, rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_sql_pool_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                         rg_15, rg_16, rg_17, checks=[])
+    step_workspace_aad_admin_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12,
+                                    rg_13, rg_14, rg_15, rg_16, rg_17, checks=[])
+    step_workspace_delete(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
+                          rg_15, rg_16, rg_17, checks=[])
     cleanup_scenario(test, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
                      rg_15, rg_16, rg_17)
 
 
-# Test class for ${scenarioName}
+# Test class for Scenario
 @try_manual
 class SynapseScenarioTest(ScenarioTest):
 
-    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5', parameter_name=''
-                           'rg_5')
+    @ResourceGroupPreparer(name_prefix='clitestsynapse_Default-SQL-SouthEastAsia'[:7], key='rg_5',
+                           parameter_name='rg_5')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_ExampleResourceGroup'[:7], key='rg', parameter_name='rg')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_resourceGroup1'[:7], key='rg_2', parameter_name='rg_2')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_sqlcrudtest-6845'[:7], key='rg_3', parameter_name='rg_3')
@@ -514,8 +514,8 @@ class SynapseScenarioTest(ScenarioTest):
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-6852'[:7], key='rg_15', parameter_name='rg_15')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_securityalert-4799'[:7], key='rg_16', parameter_name='rg_16')
     @ResourceGroupPreparer(name_prefix='clitestsynapse_exampleResourceGroup'[:7], key='rg_17', parameter_name='rg_17')
-    def test_synapse(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13, rg_14,
-                     rg_15, rg_16, rg_17):
+    def test_synapse_Scenario(self, rg_5, rg, rg_2, rg_3, rg_4, rg_6, rg_7, rg_8, rg_9, rg_10, rg_11, rg_12, rg_13,
+                              rg_14, rg_15, rg_16, rg_17):
 
         self.kwargs.update({
             'subscription_id': self.get_subscription_id()

src/utils/helper.ts

@@ -236,6 +236,7 @@ export function ToMultiLine(sentence: string, output: string[] = undefined, maxL
                     }
                 }
                 else {
+                    let CommaPos = lastComma;
                     if (lastNormal != ret[ret.length - 1].length - 1) {
                         let newLine = ' '.repeat(indent > 0 ? indent : spaceNum) + strTag + ret[ret.length - 1].substr(lastNormal + 1);
                         ret[ret.length - 1] = ret[ret.length - 1].substr(0, lastNormal + 1) + strTag;
@@ -256,13 +257,28 @@ export function ToMultiLine(sentence: string, output: string[] = undefined, maxL
                         if (isStrTags[lenLast-2]) {
                             if (ret[ret.length-2].slice(0, -2).match(/^ *$/i))
                                 ret.splice(ret.length-2, 1);
-                            else if(ret[ret.length-2].slice(-3)[0]!="=")
+                            else
                             {
                                 ret[ret.length-2] = ret[ret.length-2].slice(0, -2); // remove "" at the tail
-                                while (ret[ret.length-2].slice(-1)[0] == " ") {     // remove all spaces before ""
-                                    ret[ret.length-2] = ret[ret.length-2].slice(0, -1); 
+                                if (ret[ret.length-2].slice(-1)[0]!="=") {
+                                    while (ret[ret.length-2].slice(-1)[0] == " ") {     // remove all spaces before ""
+                                        ret[ret.length-2] = ret[ret.length-2].slice(0, -1); 
+                                    }
+                                }
+                                else {
+                                    // there is = in the end of line --> create new line from the last comma
+                                    let tmp = ret[ret.length-2].slice(CommaPos+1).trimLeft();
+                                    ret[ret.length-2] = ret[ret.length-2].slice(0, CommaPos+1);
+                                    let startSpaceNum = ret[ret.length-1].search(/\S|$/);
+                                    if (startSpaceNum>=0) {
+                                        ret[ret.length-1] = ' '.repeat(startSpaceNum) + tmp + ret[ret.length-1].substr(startSpaceNum);
+                                    }
+                                    else {
+                                        ret[ret.length-1] = tmp + ret[ret.length-1];
+                                    }
                                 }
                             }
+                            
                         }
                     }
                 }
@@ -587,4 +603,20 @@ export function calculateLevDistance(src: string, tgt: string) {
 export function distancePercentage(src: string, tgt: string) {
     let distance = calculateLevDistance(src, tgt);
     return distance/src.length;
+}
+
+export function composeParamString(maxApi: string, minApi: string, resourceType: string) {
+    let ret = "";
+    let useResourceType = false;
+    if(!isNullOrUndefined(maxApi) && maxApi.length>0) {
+        ret += ", max_api='" + maxApi + "'";
+    }
+    if(!isNullOrUndefined(minApi) && minApi.length>0) {
+        ret += ", min_api='" + minApi + "'";
+    }
+    if(!isNullOrUndefined(resourceType) && resourceType.length>0) {
+        ret += ", resource_type=" + resourceType;
+        useResourceType = true;
+    }
+    return [ret, useResourceType];
 }

src/utils/inplace.ts

@@ -360,7 +360,9 @@ export class HeadSegment extends BaseSegment {
                 nextAt = target.content.length-1;
             }
             nextAt += 1;
-            target.root.children.push(new HeadSegment(target, target.currentAt, nextAt));
+            const newStep = new HeadSegment(target, target.currentAt, nextAt);
+            target.root.children.push(newStep);
+            newStep.createChildrenByIndent();
             target.currentAt = nextAt;
             return true;
         }
@@ -383,17 +385,13 @@ export class testStepSegment extends DefSegment {
             nextAt +=  target.currentAt + 1;
             const newStep = new testStepSegment(target, target.currentAt, nextAt, remain.slice(2, remain.indexOf("\n")))
             target.root.children.push(newStep);
-            newStep.createChildren();
+            newStep.createChildrenByIndent();
             target.currentAt = nextAt;
             return true;
         }
         return false;
     }
 
-    public createChildren() {
-        this.createChildrenByIndent();
-    }
-
     public createChildrenByTestCmd() {
         let seperators = [
             ["endwith", ":\n", "declare"],
@@ -438,7 +436,9 @@ export class TailSegment extends BaseSegment {
             return false;
         }
         const nextAt = target.content.length;
-        target.root.children.push(new TailSegment(target, target.currentAt, nextAt));
+        const newStep = new TailSegment(target, target.currentAt, nextAt);
+        target.root.children.push(newStep);
+        newStep.createChildrenByIndent();
         target.currentAt = nextAt;
         return true;
     }