diff --git a/doc/04-scenario-test-configuration.md b/doc/04-scenario-test-configuration.md index bfc9ec99..762fe575 100644 --- a/doc/04-scenario-test-configuration.md +++ b/doc/04-scenario-test-configuration.md @@ -18,7 +18,7 @@ Notice 2: *Even if no configuration is provided, you can still override the auto ## How to configure? ### Basic test-scenario -In basic test-scenario, all test examples are composed in one testcase. +In basic test-scenario, all test examples are composed in one test case. Test scenario configuration can be done in file readme.cli.md, here is an example for it. ~~~ cli: @@ -44,8 +44,8 @@ Two kind of step can be used in the test-scenario, they are: }, ~~~ -### Mutli-testcase scenario -You can config multiple testcases in the test-scenario with below format: +### Mutli-test-cases scenario +You can config multiple test cases in the test-scenario with below format: ~~~ cli: cli-name: managednetwork @@ -68,11 +68,11 @@ cli: - name: ScopeAssignmentsList - name: ScopeAssignmentsDelete ~~~ -In above sample, four testcases are configured, and they will be generated in two test files: -- test_ManagedNetworks_scenario.py: three testcases will be generated in it: ManagedNetworks_scenario1, ManagedNetworks_scenario2, ManagedNetworks_scenario3. -- test_ScopeAssignments_scenario.py: one testcase generated in it: ScopeAssignments. +In above sample, four test cases are configured, and they will be generated in two test files: +- test_ManagedNetworks_scenario.py: three test cases will be generated in it: ManagedNetworks_scenario1, ManagedNetworks_scenario2, ManagedNetworks_scenario3. +- test_ScopeAssignments_scenario.py: one test case generated in it: ScopeAssignments. -Note: the part before the underscore('_') in the testcase name will be used to descibe in which test file the case will be generated. +Note: the part before the underscore('_') in the test case name will be used to descibe in which test file the case will be generated. ## What if multiple examples in swagger have duplicated name? @@ -426,7 +426,7 @@ az: ~~~ ## How to generate cmdlet tests -The cmdlet tests can be run under virtual server to check CLI command availability. Each CLI operation is a testcase in cmdlet tests: +The cmdlet tests can be run under virtual server to check CLI command availability. Each CLI operation is a test case in cmdlet tests: ~~~ class PositiveTest(ScenarioTest): # EXAMPLE: /Operation/get/Operations_List diff --git a/src/entry.ts b/src/entry.ts index 3b06bd75..dd26e0f4 100644 --- a/src/entry.ts +++ b/src/entry.ts @@ -153,6 +153,14 @@ function processFolderPath() { const pythonSdkOutputFolder: string = AzConfiguration.getValue( CodeGenConstants.pythonSdkOutputFolder, ); + + if (isNullOrUndefined(extensionName)) { + throw new Error('--az.extensions should not be null!'); + } + if (isNullOrUndefined(pythonSdkOutputFolder)) { + throw new Error('--python-sdk-output-folder should not be null!'); + } + let sdkFolder = pythonSdkOutputFolder.replace(azOutputFolder, ''); if (sdkFolder.startsWith('/')) { sdkFolder = sdkFolder.substring(1, sdkFolder.length); diff --git a/src/generate/renders/CliTopAction.ts b/src/generate/renders/CliTopAction.ts index 7e5d0a23..52d93562 100644 --- a/src/generate/renders/CliTopAction.ts +++ b/src/generate/renders/CliTopAction.ts @@ -45,7 +45,7 @@ export class CliTopAction extends TemplateBase { headerGenerator.disableUnusedWildcardImport = true; headerGenerator.generationMode = GenerationMode.Incremental; let output: string[] = headerGenerator.getLines(); - output = output.concat(this.loadGeneratedAction(0)); + output = output.concat(this.loadGeneratedAction(0, true)); return output; } else { const existingMode: GenerationMode = HeaderGenerator.GetCliGenerationMode(base); @@ -79,7 +79,7 @@ export class CliTopAction extends TemplateBase { // Add loading code block if (!hasLoadLogic) { - output = output.concat(this.loadGeneratedAction(0)); + output = output.concat(this.loadGeneratedAction(0, true)); } const appendLineStartIdx = skipLineIdx < keepLineIdx ? keepLineIdx : skipLineIdx; @@ -91,11 +91,14 @@ export class CliTopAction extends TemplateBase { } } - private loadGeneratedAction(indent: number): string[] { + private loadGeneratedAction(indent: number, incremental = false): string[] { const output: string[] = []; const indentStr: string = getIndentString(indent); output.push(''); + if (incremental) { + output.push(indentStr + '# pylint: disable=unused-wildcard-import,wildcard-import'); + } output.push(indentStr + 'from .generated.action import * # noqa: F403'); output.push(indentStr + 'try:'); output.push(indentStr + ' from .manual.action import * # noqa: F403'); diff --git a/src/generate/renders/CliTopCustom.ts b/src/generate/renders/CliTopCustom.ts index a27a65db..24f1f1ef 100644 --- a/src/generate/renders/CliTopCustom.ts +++ b/src/generate/renders/CliTopCustom.ts @@ -38,8 +38,7 @@ export class CliTopCustom extends TemplateBase { headerGenerator.disableUnusedWildcardImport = true; headerGenerator.generationMode = GenerationMode.Incremental; let output: string[] = headerGenerator.getLines(); - output = output.concat(this.loadGeneratedCustom(0)); - + output = output.concat(this.loadGeneratedCustom(0, true)); return output; } else { const existingMode: GenerationMode = HeaderGenerator.GetCliGenerationMode(base); @@ -73,7 +72,7 @@ export class CliTopCustom extends TemplateBase { // Add loading code block if (!hasLoadLogic) { - output = output.concat(this.loadGeneratedCustom(0)); + output = output.concat(this.loadGeneratedCustom(0, true)); } const appendLineStartIdx = skipLineIdx < keepLineIdx ? keepLineIdx : skipLineIdx; @@ -85,11 +84,14 @@ export class CliTopCustom extends TemplateBase { } } - private loadGeneratedCustom(indent: number): string[] { + private loadGeneratedCustom(indent: number, incremental = false): string[] { const output: string[] = []; const indentStr: string = getIndentString(indent); output.push(''); + if (incremental) { + output.push(indentStr + '# pylint: disable=unused-wildcard-import,wildcard-import'); + } output.push(indentStr + 'from .generated.custom import * # noqa: F403'); output.push(indentStr + 'try:'); output.push(indentStr + ' from .manual.custom import * # noqa: F403'); diff --git a/src/generate/renders/generated/CliParams.ts b/src/generate/renders/generated/CliParams.ts index cb777b3f..03391924 100644 --- a/src/generate/renders/generated/CliParams.ts +++ b/src/generate/renders/generated/CliParams.ts @@ -362,7 +362,7 @@ function getCommandBody(model: CodeModelAz, needGeneric = false, debug = false) argument += ' Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'; } } else { - argument += ' Expected value: json-string/@json-file.'; + argument += ' Expected value: json-string/json-file/@json-file.'; } } if (debug) { diff --git a/src/generate/renders/tests/CliTestCmdlet.ts b/src/generate/renders/tests/CliTestCmdlet.ts index aa272dd5..9499d15e 100644 --- a/src/generate/renders/tests/CliTestCmdlet.ts +++ b/src/generate/renders/tests/CliTestCmdlet.ts @@ -61,7 +61,7 @@ export class CliCmdletTest extends TemplateBase { >([ ['extension', new RenderInput()], ['commandGroup', new RenderInput()], - ['command', new RenderInput()], + ['command', new RenderInput(['methodName'])], ['method', new RenderInput()], ['azExample', new RenderInput(['id', 'httpMethod', 'rawCommandStringItems'])], ]); @@ -103,10 +103,7 @@ export class CliCmdletTest extends TemplateBase { ); } - if ( - commandLines[0].indexOf(' delete') > -1 && - example.httpMethod.toLowerCase() === 'delete' - ) { + if (command.methodName === 'delete') { commandLines[0] += ' -y'; } const exampleInfo = new ExampleInfo(); diff --git a/src/generate/renders/tests/CliTestStep.ts b/src/generate/renders/tests/CliTestStep.ts index fcafed0b..46cf1e6b 100644 --- a/src/generate/renders/tests/CliTestStep.ts +++ b/src/generate/renders/tests/CliTestStep.ts @@ -132,10 +132,7 @@ export class CliTestStep extends TemplateBase { ); } else { stepBuff[cmdString] = functionName; - if ( - exampleCmd[0].indexOf(' delete') > -1 && - examples[exampleIdx].HttpMethod.toLowerCase() === 'delete' - ) { + if (examples[exampleIdx].Method === 'delete') { exampleCmd[0] += ' -y'; } diff --git a/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/custom.py b/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/custom.py index 27b6d19b..ff3dcc73 100644 --- a/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/custom.py +++ b/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/custom.py @@ -13,6 +13,7 @@ # pylint: disable=no-self-use,too-many-lines from __future__ import print_function +# pylint: disable=unused-wildcard-import,wildcard-import from .generated.custom import * # noqa: F403 try: from .manual.custom import * # noqa: F403 diff --git a/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/generated/_params.py b/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/generated/_params.py index f5d2fcab..94d0e594 100644 --- a/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/generated/_params.py +++ b/test/scenarios/compute/output/core_Incremental/src/azure-cli/azure/cli/command_modules/vm/generated/_params.py @@ -68,10 +68,10 @@ def load_arguments(self, _): 'should be automatically upgraded by the platform if there is a newer version of the extension ' 'available.') c.argument('settings', type=validate_file_or_dict, help='Json formatted public settings for the extension. ' - 'Expected value: json-string/@json-file.') + 'Expected value: json-string/json-file/@json-file.') c.argument('protected_settings', type=validate_file_or_dict, help='The extension can contain either ' 'protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected ' - 'value: json-string/@json-file.') + 'value: json-string/json-file/@json-file.') c.argument('name', type=str, help='The virtual machine extension name.', arg_group='Instance View') c.argument('type_', options_list=['--type'], type=str, help='Specifies the type of the extension; an example ' 'is "CustomScriptExtension".', arg_group='Instance View') diff --git a/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py b/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py index d9b8171f..ed6ca421 100644 --- a/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py +++ b/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py @@ -51,7 +51,7 @@ def load_arguments(self, _): validator=get_default_location_from_resource_group) c.argument('tags', tags_type) c.argument('test_inherit', type=validate_file_or_dict, help='Test Job Base Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') c.argument('factory_vsts_configuration', action=AddFactoryVstsConfiguration, nargs='+', help='Factory\'s VSTS ' 'repo information.', arg_group='RepoConfiguration') c.argument('factory_git_hub_configuration', action=AddFactoryGitHubConfiguration, nargs='+', help='Factory\'s ' @@ -121,7 +121,7 @@ def load_arguments(self, _): c.argument('if_match', type=str, help='ETag of the trigger entity. Should only be specified for update, for ' 'which it should match existing entity or can be * for unconditional update.') c.argument('properties', type=validate_file_or_dict, help='Properties of the trigger. Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('datafactory trigger update') as c: c.argument('resource_group_name', resource_group_name_type) @@ -132,7 +132,7 @@ def load_arguments(self, _): 'which it should match existing entity or can be * for unconditional update.') c.argument('description', type=str, help='Trigger description.') c.argument('annotations', type=validate_file_or_dict, help='List of tags that can be used for describing the ' - 'trigger. Expected value: json-string/@json-file.') + 'trigger. Expected value: json-string/json-file/@json-file.') c.ignore('trigger') with self.argument_context('datafactory trigger delete') as c: @@ -215,9 +215,10 @@ def load_arguments(self, _): c.argument('fake_identity', action=AddFakeIdentity, nargs='+', help='This is only for az test.') c.argument('zones', nargs='+', help='This is only for az test.') c.argument('compute_properties', type=validate_file_or_dict, help='The compute resource for managed ' - 'integration runtime. Expected value: json-string/@json-file.', arg_group='Type Properties') + 'integration runtime. Expected value: json-string/json-file/@json-file.', arg_group='Type ' + 'Properties') c.argument('ssis_properties', type=validate_file_or_dict, help='SSIS properties for managed integration ' - 'runtime. Expected value: json-string/@json-file.', arg_group='Type Properties') + 'runtime. Expected value: json-string/json-file/@json-file.', arg_group='Type Properties') with self.argument_context('datafactory integration-runtime self-hosted create') as c: c.argument('resource_group_name', resource_group_name_type) @@ -228,7 +229,7 @@ def load_arguments(self, _): 'update, for which it should match existing entity or can be * for unconditional update.') c.argument('description', type=str, help='Integration runtime description.') c.argument('linked_info', type=validate_file_or_dict, help='The base definition of a linked integration ' - 'runtime. Expected value: json-string/@json-file.', arg_group='Type Properties') + 'runtime. Expected value: json-string/json-file/@json-file.', arg_group='Type Properties') with self.argument_context('datafactory integration-runtime update') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/kusto/output/coredefault/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py b/test/scenarios/kusto/output/coredefault/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py index 4e49d248..6651e8b3 100644 --- a/test/scenarios/kusto/output/coredefault/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py +++ b/test/scenarios/kusto/output/coredefault/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py @@ -78,7 +78,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster update') as c: c.argument('resource_group_name', resource_group_name_type) @@ -110,7 +110,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster delete') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/kusto/output/coretrack2/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py b/test/scenarios/kusto/output/coretrack2/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py index 4e49d248..6651e8b3 100644 --- a/test/scenarios/kusto/output/coretrack2/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py +++ b/test/scenarios/kusto/output/coretrack2/src/azure-cli/azure/cli/command_modules/kusto/generated/_params.py @@ -78,7 +78,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster update') as c: c.argument('resource_group_name', resource_group_name_type) @@ -110,7 +110,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster delete') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/kusto/output/ext_default_folder/src/kusto/azext_kusto/generated/_params.py b/test/scenarios/kusto/output/ext_default_folder/src/kusto/azext_kusto/generated/_params.py index e6a7a172..9440bd41 100644 --- a/test/scenarios/kusto/output/ext_default_folder/src/kusto/azext_kusto/generated/_params.py +++ b/test/scenarios/kusto/output/ext_default_folder/src/kusto/azext_kusto/generated/_params.py @@ -83,7 +83,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster update') as c: c.argument('resource_group_name', resource_group_name_type) @@ -124,7 +124,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster delete') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/kusto/output/extnosdknoflattentrack1/src/kusto/azext_kusto/generated/_params.py b/test/scenarios/kusto/output/extnosdknoflattentrack1/src/kusto/azext_kusto/generated/_params.py index e6a7a172..9440bd41 100644 --- a/test/scenarios/kusto/output/extnosdknoflattentrack1/src/kusto/azext_kusto/generated/_params.py +++ b/test/scenarios/kusto/output/extnosdknoflattentrack1/src/kusto/azext_kusto/generated/_params.py @@ -83,7 +83,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster update') as c: c.argument('resource_group_name', resource_group_name_type) @@ -124,7 +124,7 @@ def load_arguments(self, _): 'associated with the Kusto cluster. The user identity dictionary key references will be ARM ' 'resource ids in the form: \'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/prov' 'iders/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}\'. Expected value: ' - 'json-string/@json-file.', arg_group='Identity') + 'json-string/json-file/@json-file.', arg_group='Identity') with self.argument_context('kusto cluster delete') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py b/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py index b175e452..2ae5b8e2 100644 --- a/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py +++ b/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py @@ -44,7 +44,7 @@ def load_arguments(self, _): 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', type=validate_file_or_dict, help='Parameters supplied to the create/update a ' - 'Managed Network Resource Expected value: json-string/@json-file.') + 'Managed Network Resource Expected value: json-string/json-file/@json-file.') with self.argument_context('managed-network mn update') as c: c.argument('resource_group_name', resource_group_name_type) @@ -120,7 +120,7 @@ def load_arguments(self, _): c.argument('location', arg_type=get_location_type(self.cli_ctx), required=False, validator=get_default_location_from_resource_group) c.argument('management_groups', type=validate_file_or_dict, help='The collection of management groups covered ' - 'by the Managed Network Expected value: json-string/@json-file.') + 'by the Managed Network Expected value: json-string/json-file/@json-file.') c.argument('subscriptions', action=AddSubscriptions, nargs='+', help='The collection of subscriptions covered ' 'by the Managed Network') c.argument('virtual_networks', action=AddVirtualNetworks, nargs='+', help='The collection of virtual nets ' @@ -135,7 +135,7 @@ def load_arguments(self, _): c.argument('location', arg_type=get_location_type(self.cli_ctx), required=False, validator=get_default_location_from_resource_group) c.argument('management_groups', type=validate_file_or_dict, help='The collection of management groups covered ' - 'by the Managed Network Expected value: json-string/@json-file.') + 'by the Managed Network Expected value: json-string/json-file/@json-file.') c.argument('subscriptions', action=AddSubscriptions, nargs='+', help='The collection of subscriptions covered ' 'by the Managed Network') c.argument('virtual_networks', action=AddVirtualNetworks, nargs='+', help='The collection of virtual nets ' diff --git a/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/action.py b/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/action.py index 8af4156c..fd5e65a3 100644 --- a/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/action.py +++ b/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/action.py @@ -12,6 +12,7 @@ # pylint: disable=wildcard-import # pylint: disable=unused-wildcard-import +# pylint: disable=unused-wildcard-import,wildcard-import from .generated.action import * # noqa: F403 try: from .manual.action import * # noqa: F403 diff --git a/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/custom.py b/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/custom.py index 4a4185aa..bccde6e6 100644 --- a/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/custom.py +++ b/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/custom.py @@ -10,6 +10,7 @@ # Generation mode: Incremental # -------------------------------------------------------------------------- +# pylint: disable=unused-wildcard-import,wildcard-import from .generated.custom import * # noqa: F403 try: from .manual.custom import * # noqa: F403 diff --git a/test/scenarios/msgraphuser/output/users_v1_0/azext_users_v1_0/generated/_params.py b/test/scenarios/msgraphuser/output/users_v1_0/azext_users_v1_0/generated/_params.py index 2cf769c1..eefded9e 100644 --- a/test/scenarios/msgraphuser/output/users_v1_0/azext_users_v1_0/generated/_params.py +++ b/test/scenarios/msgraphuser/output/users_v1_0/azext_users_v1_0/generated/_params.py @@ -226,7 +226,7 @@ def load_arguments(self, _): 'the user. (The users and contacts that have their manager property set to this user.) Read-only. ' 'Nullable.') c.argument('license_details', type=validate_file_or_dict, help='A collection of this user\'s license details. ' - 'Read-only. Expected value: json-string/@json-file.') + 'Read-only. Expected value: json-string/json-file/@json-file.') c.argument('manager', action=AddManager, nargs='+', help='Represents an Azure Active Directory object. The ' 'directoryObject type is the base type for many other directory entity types.') c.argument('member_of', action=AddMemberOf, nargs='+', help='The groups and directory roles that the user is a ' @@ -238,46 +238,51 @@ def load_arguments(self, _): 'user. Read-only. Nullable.') c.argument('registered_devices', action=AddRegisteredDevices, nargs='+', help='Devices that are registered for ' 'the user. Read-only. Nullable.') - c.argument('scoped_role_member_of', type=validate_file_or_dict, - help=' Expected value: json-string/@json-file.') + c.argument('scoped_role_member_of', type=validate_file_or_dict, help=' Expected value: ' + 'json-string/json-file/@json-file.') c.argument('transitive_member_of', action=AddTransitiveMemberOf, nargs='+', help='') - c.argument('calendar', type=validate_file_or_dict, help='calendar Expected value: json-string/@json-file.') + c.argument('calendar', type=validate_file_or_dict, help='calendar Expected value: ' + 'json-string/json-file/@json-file.') c.argument('calendar_groups', type=validate_file_or_dict, help='The user\'s calendar groups. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('calendars', type=validate_file_or_dict, help='The user\'s calendars. Read-only. Nullable. Expected ' - 'value: json-string/@json-file.') + 'value: json-string/json-file/@json-file.') c.argument('calendar_view', type=validate_file_or_dict, help='The calendar view for the calendar. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('contact_folders', type=validate_file_or_dict, help='The user\'s contacts folders. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('contacts', type=validate_file_or_dict, help='The user\'s contacts. Read-only. Nullable. Expected ' - 'value: json-string/@json-file.') + 'value: json-string/json-file/@json-file.') c.argument('events', type=validate_file_or_dict, help='The user\'s events. Default is to show Events under the ' - 'Default Calendar. Read-only. Nullable. Expected value: json-string/@json-file.') + 'Default Calendar. Read-only. Nullable. Expected value: json-string/json-file/@json-file.') c.argument('mail_folders', type=validate_file_or_dict, help='The user\'s mail folders. Read-only. Nullable. ' - 'Expected value: json-string/@json-file.') + 'Expected value: json-string/json-file/@json-file.') c.argument('messages', type=validate_file_or_dict, help='The messages in a mailbox or folder. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('people', type=validate_file_or_dict, help='People that are relevant to the user. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('photo', action=AddPhoto, nargs='+', help='profilePhoto') c.argument('photos', action=AddPhotos, nargs='+', help='') - c.argument('drive', type=validate_file_or_dict, help='drive Expected value: json-string/@json-file.') + c.argument('drive', type=validate_file_or_dict, + help='drive Expected value: json-string/json-file/@json-file.') c.argument('drives', type=validate_file_or_dict, help='A collection of drives available for this user. ' - 'Read-only. Expected value: json-string/@json-file.') - c.argument('followed_sites', type=validate_file_or_dict, help=' Expected value: json-string/@json-file.') + 'Read-only. Expected value: json-string/json-file/@json-file.') + c.argument('followed_sites', type=validate_file_or_dict, help=' Expected value: json-string/json-file/@json-fil' + 'e.') c.argument('extensions', action=AddExtensions, nargs='+', help='The collection of open extensions defined for ' 'the user. Read-only. Nullable.') c.argument('managed_devices', type=validate_file_or_dict, help='The managed devices associated with the user. ' - 'Expected value: json-string/@json-file.') + 'Expected value: json-string/json-file/@json-file.') c.argument('managed_app_registrations', type=validate_file_or_dict, help='Zero or more managed app ' - 'registrations that belong to the user. Expected value: json-string/@json-file.') + 'registrations that belong to the user. Expected value: json-string/json-file/@json-file.') c.argument('device_management_troubleshooting_events', action=AddDeviceManagementTroubleshootingEvents, nargs='+', help='The list of troubleshooting events for this user.') c.argument('activities', type=validate_file_or_dict, help='The user\'s activities across devices. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') - c.argument('online_meetings', type=validate_file_or_dict, help=' Expected value: json-string/@json-file.') - c.argument('joined_teams', type=validate_file_or_dict, help=' Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') + c.argument('online_meetings', type=validate_file_or_dict, help=' Expected value: ' + 'json-string/json-file/@json-file.') + c.argument('joined_teams', type=validate_file_or_dict, help=' Expected value: json-string/json-file/@json-file.' + '') c.argument('body_contains', nargs='+', help='Represents the strings that should appear in the body of an ' 'incoming message in order for the condition or exception to apply.', arg_group='Exceptions') c.argument('body_or_subject_contains', nargs='+', help='Represents the strings that should appear in the body ' @@ -287,7 +292,7 @@ def load_arguments(self, _): 'with in order for the condition or exception to apply.', arg_group='Exceptions') c.argument('from_addresses', type=validate_file_or_dict, help='Represents the specific sender email addresses ' 'of an incoming message in order for the condition or exception to apply. Expected value: ' - 'json-string/@json-file.', arg_group='Exceptions') + 'json-string/json-file/@json-file.', arg_group='Exceptions') c.argument('has_attachments', arg_type=get_three_state_flag(), help='Indicates whether an incoming message ' 'must have attachments in order for the condition or exception to apply.', arg_group='Exceptions') c.argument('header_contains', nargs='+', help='Represents the strings that appear in the headers of an ' @@ -349,7 +354,7 @@ def load_arguments(self, _): 'to apply.', arg_group='Exceptions') c.argument('sent_to_addresses', type=validate_file_or_dict, help='Represents the email addresses that an ' 'incoming message must have been sent to in order for the condition or exception to apply. Expected ' - 'value: json-string/@json-file.', arg_group='Exceptions') + 'value: json-string/json-file/@json-file.', arg_group='Exceptions') c.argument('sent_to_me', arg_type=get_three_state_flag(), help='Indicates whether the owner of the mailbox ' 'must be in the toRecipients property of an incoming message in order for the condition or ' 'exception to apply.', arg_group='Exceptions') @@ -371,7 +376,8 @@ def load_arguments(self, _): arg_group='Conditions') c.argument('microsoft_graph_message_rule_predicates_from_addresses', type=validate_file_or_dict, help='Represents the specific sender email addresses of an incoming message in order for the ' - 'condition or exception to apply. Expected value: json-string/@json-file.', arg_group='Conditions') + 'condition or exception to apply. Expected value: json-string/json-file/@json-file.', + arg_group='Conditions') c.argument('boolean_has_attachments', arg_type=get_three_state_flag(), help='Indicates whether an incoming ' 'message must have attachments in order for the condition or exception to apply.', arg_group='Conditions') @@ -438,7 +444,7 @@ def load_arguments(self, _): c.argument('microsoft_graph_message_rule_predicates_sent_to_addresses_sent_to_addresses', type=validate_file_or_dict, help='Represents the email addresses that an incoming message must have ' 'been sent to in order for the condition or exception to apply. Expected value: ' - 'json-string/@json-file.', arg_group='Conditions') + 'json-string/json-file/@json-file.', arg_group='Conditions') c.argument('boolean_sent_to_me', arg_type=get_three_state_flag(), help='Indicates whether the owner of the ' 'mailbox must be in the toRecipients property of an incoming message in order for the condition or ' 'exception to apply.', arg_group='Conditions') @@ -452,23 +458,23 @@ def load_arguments(self, _): help='sizeRange', arg_group='Conditions') c.argument('microsoft_graph_entity_id', type=str, help='Read-only.', arg_group='Onenote') c.argument('notebooks', type=validate_file_or_dict, help='The collection of OneNote notebooks that are owned ' - 'by the user or group. Read-only. Nullable. Expected value: json-string/@json-file.', + 'by the user or group. Read-only. Nullable. Expected value: json-string/json-file/@json-file.', arg_group='Onenote') c.argument('operations', type=validate_file_or_dict, help='The status of OneNote operations. Getting an ' 'operations collection is not supported, but you can get the status of long-running operations if ' 'the Operation-Location header is returned in the response. Read-only. Nullable. Expected value: ' - 'json-string/@json-file.', arg_group='Onenote') + 'json-string/json-file/@json-file.', arg_group='Onenote') c.argument('pages', type=validate_file_or_dict, help='The pages in all OneNote notebooks that are owned by the ' - 'user or group. Read-only. Nullable. Expected value: json-string/@json-file.', + 'user or group. Read-only. Nullable. Expected value: json-string/json-file/@json-file.', arg_group='Onenote') c.argument('resources', action=AddResources, nargs='+', help='The image and other file resources in OneNote ' 'pages. Getting a resources collection is not supported, but you can get the binary content of a ' 'specific resource. Read-only. Nullable.', arg_group='Onenote') c.argument('section_groups', type=validate_file_or_dict, help='The section groups in all OneNote notebooks ' - 'that are owned by the user or group. Read-only. Nullable. Expected value: json-string/@json-file.', - arg_group='Onenote') + 'that are owned by the user or group. Read-only. Nullable. Expected value: ' + 'json-string/json-file/@json-file.', arg_group='Onenote') c.argument('sections', type=validate_file_or_dict, help='The sections in all OneNote notebooks that are owned ' - 'by the user or group. Read-only. Nullable. Expected value: json-string/@json-file.', + 'by the user or group. Read-only. Nullable. Expected value: json-string/json-file/@json-file.', arg_group='Onenote') c.argument('id1', type=str, help='Read-only.', arg_group='Settings') c.argument('contribution_to_content_discovery_as_organization_disabled', arg_type=get_three_state_flag(), @@ -490,38 +496,38 @@ def load_arguments(self, _): c.argument('user', action=AddApplication, nargs='+', help='identity', arg_group='Settings Shift Preferences ' 'Last Modified By') c.argument('availability', type=validate_file_or_dict, help='Availability of the user to be scheduled for work ' - 'and its recurrence pattern. Expected value: json-string/@json-file.', arg_group='Settings Shift ' - 'Preferences') + 'and its recurrence pattern. Expected value: json-string/json-file/@json-file.', + arg_group='Settings Shift Preferences') c.argument('id3', type=str, help='Read-only.', arg_group='Insights') c.argument('shared', type=validate_file_or_dict, help='Calculated relationship identifying documents shared ' 'with or by the user. This includes URLs, file attachments, and reference attachments to OneDrive ' 'for Business and SharePoint files found in Outlook messages and meetings. This also includes URLs ' 'and reference attachments to Teams conversations. Ordered by recency of share. Expected value: ' - 'json-string/@json-file.', arg_group='Insights') + 'json-string/json-file/@json-file.', arg_group='Insights') c.argument('trending', type=validate_file_or_dict, help='Calculated relationship identifying documents ' 'trending around a user. Trending documents are calculated based on activity of the user\'s closest ' 'network of people and include files stored in OneDrive for Business and SharePoint. Trending ' 'insights help the user to discover potentially useful content that the user has access to, but has ' - 'never viewed before. Expected value: json-string/@json-file.', arg_group='Insights') + 'never viewed before. Expected value: json-string/json-file/@json-file.', arg_group='Insights') c.argument('used', type=validate_file_or_dict, help='Calculated relationship identifying the latest documents ' 'viewed or modified by a user, including OneDrive for Business and SharePoint documents, ranked by ' - 'recency of use. Expected value: json-string/@json-file.', arg_group='Insights') + 'recency of use. Expected value: json-string/json-file/@json-file.', arg_group='Insights') c.argument('id4', type=str, help='Read-only.', arg_group='Planner') c.argument('plans', type=validate_file_or_dict, help='Read-only. Nullable. Returns the plannerTasks assigned ' - 'to the user. Expected value: json-string/@json-file.', arg_group='Planner') + 'to the user. Expected value: json-string/json-file/@json-file.', arg_group='Planner') c.argument('tasks', type=validate_file_or_dict, help='Read-only. Nullable. Returns the plannerPlans shared ' - 'with the user. Expected value: json-string/@json-file.', arg_group='Planner') + 'with the user. Expected value: json-string/json-file/@json-file.', arg_group='Planner') c.argument('id5', type=str, help='Read-only.', arg_group='Outlook') c.argument('master_categories', action=AddMasterCategories, nargs='+', help='A list of categories defined for ' 'the user.', arg_group='Outlook') c.argument('id6', type=str, help='Read-only.', arg_group='Inference Classification') c.argument('overrides', type=validate_file_or_dict, help='A set of overrides for a user to always classify ' 'messages from specific senders in certain ways: focused, or other. Read-only. Nullable. Expected ' - 'value: json-string/@json-file.', arg_group='Inference Classification') + 'value: json-string/json-file/@json-file.', arg_group='Inference Classification') c.argument('archive_folder', type=str, help='Folder ID of an archive folder for the user.', arg_group='Mailbox ' 'Settings') c.argument('automatic_replies_setting', type=validate_file_or_dict, help='automaticRepliesSetting Expected ' - 'value: json-string/@json-file.', arg_group='Mailbox Settings') + 'value: json-string/json-file/@json-file.', arg_group='Mailbox Settings') c.argument('date_format', type=str, help='The date format for the user\'s mailbox.', arg_group='Mailbox ' 'Settings') c.argument('delegate_meeting_message_delivery_options', arg_type=get_enum_type([ @@ -536,7 +542,7 @@ def load_arguments(self, _): c.argument('time_zone', type=str, help='The default time zone for the user\'s mailbox.', arg_group='Mailbox ' 'Settings') c.argument('working_hours', type=validate_file_or_dict, help='workingHours Expected value: ' - 'json-string/@json-file.', arg_group='Mailbox Settings') + 'json-string/json-file/@json-file.', arg_group='Mailbox Settings') with self.argument_context('users user update') as c: c.argument('user_id', type=str, help='key: id of user') @@ -705,7 +711,7 @@ def load_arguments(self, _): 'the user. (The users and contacts that have their manager property set to this user.) Read-only. ' 'Nullable.') c.argument('license_details', type=validate_file_or_dict, help='A collection of this user\'s license details. ' - 'Read-only. Expected value: json-string/@json-file.') + 'Read-only. Expected value: json-string/json-file/@json-file.') c.argument('manager', action=AddManager, nargs='+', help='Represents an Azure Active Directory object. The ' 'directoryObject type is the base type for many other directory entity types.') c.argument('member_of', action=AddMemberOf, nargs='+', help='The groups and directory roles that the user is a ' @@ -717,46 +723,51 @@ def load_arguments(self, _): 'user. Read-only. Nullable.') c.argument('registered_devices', action=AddRegisteredDevices, nargs='+', help='Devices that are registered for ' 'the user. Read-only. Nullable.') - c.argument('scoped_role_member_of', type=validate_file_or_dict, - help=' Expected value: json-string/@json-file.') + c.argument('scoped_role_member_of', type=validate_file_or_dict, help=' Expected value: ' + 'json-string/json-file/@json-file.') c.argument('transitive_member_of', action=AddTransitiveMemberOf, nargs='+', help='') - c.argument('calendar', type=validate_file_or_dict, help='calendar Expected value: json-string/@json-file.') + c.argument('calendar', type=validate_file_or_dict, help='calendar Expected value: ' + 'json-string/json-file/@json-file.') c.argument('calendar_groups', type=validate_file_or_dict, help='The user\'s calendar groups. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('calendars', type=validate_file_or_dict, help='The user\'s calendars. Read-only. Nullable. Expected ' - 'value: json-string/@json-file.') + 'value: json-string/json-file/@json-file.') c.argument('calendar_view', type=validate_file_or_dict, help='The calendar view for the calendar. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('contact_folders', type=validate_file_or_dict, help='The user\'s contacts folders. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('contacts', type=validate_file_or_dict, help='The user\'s contacts. Read-only. Nullable. Expected ' - 'value: json-string/@json-file.') + 'value: json-string/json-file/@json-file.') c.argument('events', type=validate_file_or_dict, help='The user\'s events. Default is to show Events under the ' - 'Default Calendar. Read-only. Nullable. Expected value: json-string/@json-file.') + 'Default Calendar. Read-only. Nullable. Expected value: json-string/json-file/@json-file.') c.argument('mail_folders', type=validate_file_or_dict, help='The user\'s mail folders. Read-only. Nullable. ' - 'Expected value: json-string/@json-file.') + 'Expected value: json-string/json-file/@json-file.') c.argument('messages', type=validate_file_or_dict, help='The messages in a mailbox or folder. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('people', type=validate_file_or_dict, help='People that are relevant to the user. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') c.argument('photo', action=AddPhoto, nargs='+', help='profilePhoto') c.argument('photos', action=AddPhotos, nargs='+', help='') - c.argument('drive', type=validate_file_or_dict, help='drive Expected value: json-string/@json-file.') + c.argument('drive', type=validate_file_or_dict, + help='drive Expected value: json-string/json-file/@json-file.') c.argument('drives', type=validate_file_or_dict, help='A collection of drives available for this user. ' - 'Read-only. Expected value: json-string/@json-file.') - c.argument('followed_sites', type=validate_file_or_dict, help=' Expected value: json-string/@json-file.') + 'Read-only. Expected value: json-string/json-file/@json-file.') + c.argument('followed_sites', type=validate_file_or_dict, help=' Expected value: json-string/json-file/@json-fil' + 'e.') c.argument('extensions', action=AddExtensions, nargs='+', help='The collection of open extensions defined for ' 'the user. Read-only. Nullable.') c.argument('managed_devices', type=validate_file_or_dict, help='The managed devices associated with the user. ' - 'Expected value: json-string/@json-file.') + 'Expected value: json-string/json-file/@json-file.') c.argument('managed_app_registrations', type=validate_file_or_dict, help='Zero or more managed app ' - 'registrations that belong to the user. Expected value: json-string/@json-file.') + 'registrations that belong to the user. Expected value: json-string/json-file/@json-file.') c.argument('device_management_troubleshooting_events', action=AddDeviceManagementTroubleshootingEvents, nargs='+', help='The list of troubleshooting events for this user.') c.argument('activities', type=validate_file_or_dict, help='The user\'s activities across devices. Read-only. ' - 'Nullable. Expected value: json-string/@json-file.') - c.argument('online_meetings', type=validate_file_or_dict, help=' Expected value: json-string/@json-file.') - c.argument('joined_teams', type=validate_file_or_dict, help=' Expected value: json-string/@json-file.') + 'Nullable. Expected value: json-string/json-file/@json-file.') + c.argument('online_meetings', type=validate_file_or_dict, help=' Expected value: ' + 'json-string/json-file/@json-file.') + c.argument('joined_teams', type=validate_file_or_dict, help=' Expected value: json-string/json-file/@json-file.' + '') c.argument('body_contains', nargs='+', help='Represents the strings that should appear in the body of an ' 'incoming message in order for the condition or exception to apply.', arg_group='Exceptions') c.argument('body_or_subject_contains', nargs='+', help='Represents the strings that should appear in the body ' @@ -766,7 +777,7 @@ def load_arguments(self, _): 'with in order for the condition or exception to apply.', arg_group='Exceptions') c.argument('from_addresses', type=validate_file_or_dict, help='Represents the specific sender email addresses ' 'of an incoming message in order for the condition or exception to apply. Expected value: ' - 'json-string/@json-file.', arg_group='Exceptions') + 'json-string/json-file/@json-file.', arg_group='Exceptions') c.argument('has_attachments', arg_type=get_three_state_flag(), help='Indicates whether an incoming message ' 'must have attachments in order for the condition or exception to apply.', arg_group='Exceptions') c.argument('header_contains', nargs='+', help='Represents the strings that appear in the headers of an ' @@ -828,7 +839,7 @@ def load_arguments(self, _): 'to apply.', arg_group='Exceptions') c.argument('sent_to_addresses', type=validate_file_or_dict, help='Represents the email addresses that an ' 'incoming message must have been sent to in order for the condition or exception to apply. Expected ' - 'value: json-string/@json-file.', arg_group='Exceptions') + 'value: json-string/json-file/@json-file.', arg_group='Exceptions') c.argument('sent_to_me', arg_type=get_three_state_flag(), help='Indicates whether the owner of the mailbox ' 'must be in the toRecipients property of an incoming message in order for the condition or ' 'exception to apply.', arg_group='Exceptions') @@ -850,7 +861,8 @@ def load_arguments(self, _): arg_group='Conditions') c.argument('microsoft_graph_message_rule_predicates_from_addresses', type=validate_file_or_dict, help='Represents the specific sender email addresses of an incoming message in order for the ' - 'condition or exception to apply. Expected value: json-string/@json-file.', arg_group='Conditions') + 'condition or exception to apply. Expected value: json-string/json-file/@json-file.', + arg_group='Conditions') c.argument('boolean_has_attachments', arg_type=get_three_state_flag(), help='Indicates whether an incoming ' 'message must have attachments in order for the condition or exception to apply.', arg_group='Conditions') @@ -917,7 +929,7 @@ def load_arguments(self, _): c.argument('microsoft_graph_message_rule_predicates_sent_to_addresses_sent_to_addresses', type=validate_file_or_dict, help='Represents the email addresses that an incoming message must have ' 'been sent to in order for the condition or exception to apply. Expected value: ' - 'json-string/@json-file.', arg_group='Conditions') + 'json-string/json-file/@json-file.', arg_group='Conditions') c.argument('boolean_sent_to_me', arg_type=get_three_state_flag(), help='Indicates whether the owner of the ' 'mailbox must be in the toRecipients property of an incoming message in order for the condition or ' 'exception to apply.', arg_group='Conditions') @@ -931,23 +943,23 @@ def load_arguments(self, _): help='sizeRange', arg_group='Conditions') c.argument('microsoft_graph_entity_id', type=str, help='Read-only.', arg_group='Onenote') c.argument('notebooks', type=validate_file_or_dict, help='The collection of OneNote notebooks that are owned ' - 'by the user or group. Read-only. Nullable. Expected value: json-string/@json-file.', + 'by the user or group. Read-only. Nullable. Expected value: json-string/json-file/@json-file.', arg_group='Onenote') c.argument('operations', type=validate_file_or_dict, help='The status of OneNote operations. Getting an ' 'operations collection is not supported, but you can get the status of long-running operations if ' 'the Operation-Location header is returned in the response. Read-only. Nullable. Expected value: ' - 'json-string/@json-file.', arg_group='Onenote') + 'json-string/json-file/@json-file.', arg_group='Onenote') c.argument('pages', type=validate_file_or_dict, help='The pages in all OneNote notebooks that are owned by the ' - 'user or group. Read-only. Nullable. Expected value: json-string/@json-file.', + 'user or group. Read-only. Nullable. Expected value: json-string/json-file/@json-file.', arg_group='Onenote') c.argument('resources', action=AddResources, nargs='+', help='The image and other file resources in OneNote ' 'pages. Getting a resources collection is not supported, but you can get the binary content of a ' 'specific resource. Read-only. Nullable.', arg_group='Onenote') c.argument('section_groups', type=validate_file_or_dict, help='The section groups in all OneNote notebooks ' - 'that are owned by the user or group. Read-only. Nullable. Expected value: json-string/@json-file.', - arg_group='Onenote') + 'that are owned by the user or group. Read-only. Nullable. Expected value: ' + 'json-string/json-file/@json-file.', arg_group='Onenote') c.argument('sections', type=validate_file_or_dict, help='The sections in all OneNote notebooks that are owned ' - 'by the user or group. Read-only. Nullable. Expected value: json-string/@json-file.', + 'by the user or group. Read-only. Nullable. Expected value: json-string/json-file/@json-file.', arg_group='Onenote') c.argument('id1', type=str, help='Read-only.', arg_group='Settings') c.argument('contribution_to_content_discovery_as_organization_disabled', arg_type=get_three_state_flag(), @@ -969,38 +981,38 @@ def load_arguments(self, _): c.argument('user', action=AddApplication, nargs='+', help='identity', arg_group='Settings Shift Preferences ' 'Last Modified By') c.argument('availability', type=validate_file_or_dict, help='Availability of the user to be scheduled for work ' - 'and its recurrence pattern. Expected value: json-string/@json-file.', arg_group='Settings Shift ' - 'Preferences') + 'and its recurrence pattern. Expected value: json-string/json-file/@json-file.', + arg_group='Settings Shift Preferences') c.argument('id3', type=str, help='Read-only.', arg_group='Insights') c.argument('shared', type=validate_file_or_dict, help='Calculated relationship identifying documents shared ' 'with or by the user. This includes URLs, file attachments, and reference attachments to OneDrive ' 'for Business and SharePoint files found in Outlook messages and meetings. This also includes URLs ' 'and reference attachments to Teams conversations. Ordered by recency of share. Expected value: ' - 'json-string/@json-file.', arg_group='Insights') + 'json-string/json-file/@json-file.', arg_group='Insights') c.argument('trending', type=validate_file_or_dict, help='Calculated relationship identifying documents ' 'trending around a user. Trending documents are calculated based on activity of the user\'s closest ' 'network of people and include files stored in OneDrive for Business and SharePoint. Trending ' 'insights help the user to discover potentially useful content that the user has access to, but has ' - 'never viewed before. Expected value: json-string/@json-file.', arg_group='Insights') + 'never viewed before. Expected value: json-string/json-file/@json-file.', arg_group='Insights') c.argument('used', type=validate_file_or_dict, help='Calculated relationship identifying the latest documents ' 'viewed or modified by a user, including OneDrive for Business and SharePoint documents, ranked by ' - 'recency of use. Expected value: json-string/@json-file.', arg_group='Insights') + 'recency of use. Expected value: json-string/json-file/@json-file.', arg_group='Insights') c.argument('id4', type=str, help='Read-only.', arg_group='Planner') c.argument('plans', type=validate_file_or_dict, help='Read-only. Nullable. Returns the plannerTasks assigned ' - 'to the user. Expected value: json-string/@json-file.', arg_group='Planner') + 'to the user. Expected value: json-string/json-file/@json-file.', arg_group='Planner') c.argument('tasks', type=validate_file_or_dict, help='Read-only. Nullable. Returns the plannerPlans shared ' - 'with the user. Expected value: json-string/@json-file.', arg_group='Planner') + 'with the user. Expected value: json-string/json-file/@json-file.', arg_group='Planner') c.argument('id5', type=str, help='Read-only.', arg_group='Outlook') c.argument('master_categories', action=AddMasterCategories, nargs='+', help='A list of categories defined for ' 'the user.', arg_group='Outlook') c.argument('id6', type=str, help='Read-only.', arg_group='Inference Classification') c.argument('overrides', type=validate_file_or_dict, help='A set of overrides for a user to always classify ' 'messages from specific senders in certain ways: focused, or other. Read-only. Nullable. Expected ' - 'value: json-string/@json-file.', arg_group='Inference Classification') + 'value: json-string/json-file/@json-file.', arg_group='Inference Classification') c.argument('archive_folder', type=str, help='Folder ID of an archive folder for the user.', arg_group='Mailbox ' 'Settings') c.argument('automatic_replies_setting', type=validate_file_or_dict, help='automaticRepliesSetting Expected ' - 'value: json-string/@json-file.', arg_group='Mailbox Settings') + 'value: json-string/json-file/@json-file.', arg_group='Mailbox Settings') c.argument('date_format', type=str, help='The date format for the user\'s mailbox.', arg_group='Mailbox ' 'Settings') c.argument('delegate_meeting_message_delivery_options', arg_type=get_enum_type([ @@ -1015,7 +1027,7 @@ def load_arguments(self, _): c.argument('time_zone', type=str, help='The default time zone for the user\'s mailbox.', arg_group='Mailbox ' 'Settings') c.argument('working_hours', type=validate_file_or_dict, help='workingHours Expected value: ' - 'json-string/@json-file.', arg_group='Mailbox Settings') + 'json-string/json-file/@json-file.', arg_group='Mailbox Settings') with self.argument_context('users user delete') as c: c.argument('user_id', type=str, help='key: id of user') @@ -1044,42 +1056,42 @@ def load_arguments(self, _): with self.argument_context('users user create-ref-created-object') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user create-ref-direct-report') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user create-ref-member-of') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user create-ref-oauth2-permission-grant') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user create-ref-owned-device') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user create-ref-owned-object') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user create-ref-registered-device') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user create-ref-transitive-member-of') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref value Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user delete-extension') as c: c.argument('user_id', type=str, help='key: id of user') @@ -1209,7 +1221,7 @@ def load_arguments(self, _): with self.argument_context('users user set-ref-manager') as c: c.argument('user_id', type=str, help='key: id of user') c.argument('body', type=validate_file_or_dict, help='New navigation property ref values Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('users user show-extension') as c: c.argument('user_id', type=str, help='key: id of user') @@ -1296,8 +1308,8 @@ def load_arguments(self, _): c.argument('user', action=AddApplication, nargs='+', help='identity', arg_group='Shift Preferences Last ' 'Modified By') c.argument('availability', type=validate_file_or_dict, help='Availability of the user to be scheduled for work ' - 'and its recurrence pattern. Expected value: json-string/@json-file.', - arg_group='Shift Preferences') + 'and its recurrence pattern. Expected value: json-string/json-file/@json-file.', arg_group='Shift ' + 'Preferences') with self.argument_context('users user-outlook create-master-category') as c: c.argument('user_id', type=str, help='key: id of user') @@ -1363,4 +1375,4 @@ def load_arguments(self, _): c.argument('device', action=AddApplication, nargs='+', help='identity', arg_group='Last Modified By') c.argument('user', action=AddApplication, nargs='+', help='identity', arg_group='Last Modified By') c.argument('availability', type=validate_file_or_dict, help='Availability of the user to be scheduled for work ' - 'and its recurrence pattern. Expected value: json-string/@json-file.') + 'and its recurrence pattern. Expected value: json-string/json-file/@json-file.') diff --git a/test/scenarios/synapse/output/coredefault/src/azure-cli/azure/cli/command_modules/synapse/generated/_params.py b/test/scenarios/synapse/output/coredefault/src/azure-cli/azure/cli/command_modules/synapse/generated/_params.py index 7fa1003a..ba14007d 100644 --- a/test/scenarios/synapse/output/coredefault/src/azure-cli/azure/cli/command_modules/synapse/generated/_params.py +++ b/test/scenarios/synapse/output/coredefault/src/azure-cli/azure/cli/command_modules/synapse/generated/_params.py @@ -135,7 +135,7 @@ 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('ip_firewall_rules', type=validate_file_or_dict, help='IP firewall rule properties Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse ip-firewall-rule wait') as c: c.argument('resource_group_name', resource_group_name_type) @@ -681,7 +681,7 @@ def load_arguments(self, _): c.argument('managed_virtual_network', type=str, help='Setting this to \'default\' will ensure that all compute ' 'for this workspace is in a virtual network managed on behalf of the user.') c.argument('private_endpoint_connections', type=validate_file_or_dict, help='Private endpoint connections to ' - 'the workspace Expected value: json-string/@json-file.') + 'the workspace Expected value: json-string/json-file/@json-file.') c.argument('compute_subnet_id', type=str, help='Subnet ID used for computes in workspace', arg_group='Virtual ' 'Network Profile') c.argument('type_', options_list=['--type'], arg_type=get_enum_type(['None', 'SystemAssigned']), help='The ' @@ -773,7 +773,7 @@ def load_arguments(self, _): c.argument('if_match', type=str, help='ETag of the integration runtime entity. Should only be specified for ' 'update, for which it should match existing entity or can be * for unconditional update.') c.argument('properties', type=validate_file_or_dict, help='Integration runtime properties. Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse integration-runtime update') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/synapse/output/ext_default_folder/src/synapse/azext_synapse/generated/_params.py b/test/scenarios/synapse/output/ext_default_folder/src/synapse/azext_synapse/generated/_params.py index 99f878d6..ae6c425b 100644 --- a/test/scenarios/synapse/output/ext_default_folder/src/synapse/azext_synapse/generated/_params.py +++ b/test/scenarios/synapse/output/ext_default_folder/src/synapse/azext_synapse/generated/_params.py @@ -136,7 +136,7 @@ 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('ip_firewall_rules', type=validate_file_or_dict, help='IP firewall rule properties Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse ip-firewall-rule wait') as c: c.argument('resource_group_name', resource_group_name_type) @@ -683,7 +683,7 @@ def load_arguments(self, _): c.argument('managed_virtual_network', type=str, help='Setting this to \'default\' will ensure that all compute ' 'for this workspace is in a virtual network managed on behalf of the user.') c.argument('private_endpoint_connections', type=validate_file_or_dict, help='Private endpoint connections to ' - 'the workspace Expected value: json-string/@json-file.') + 'the workspace Expected value: json-string/json-file/@json-file.') c.argument('compute_subnet_id', type=str, help='Subnet ID used for computes in workspace', arg_group='Virtual ' 'Network Profile') c.argument('type_', options_list=['--type'], arg_type=get_enum_type(['None', 'SystemAssigned']), help='The ' @@ -775,7 +775,7 @@ def load_arguments(self, _): c.argument('if_match', type=str, help='ETag of the integration runtime entity. Should only be specified for ' 'update, for which it should match existing entity or can be * for unconditional update.') c.argument('properties', type=validate_file_or_dict, help='Integration runtime properties. Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse integration-runtime update') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_params.py b/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_params.py index e474b9f4..476f72ce 100644 --- a/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_params.py +++ b/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_params.py @@ -135,7 +135,7 @@ 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('ip_firewall_rules', type=validate_file_or_dict, help='IP firewall rule properties Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse ip-firewall-rule wait') as c: c.argument('resource_group_name', resource_group_name_type) @@ -678,7 +678,7 @@ def load_arguments(self, _): c.argument('managed_virtual_network', type=str, help='Setting this to \'default\' will ensure that all compute ' 'for this workspace is in a virtual network managed on behalf of the user.') c.argument('private_endpoint_connections', type=validate_file_or_dict, help='Private endpoint connections to ' - 'the workspace Expected value: json-string/@json-file.') + 'the workspace Expected value: json-string/json-file/@json-file.') c.argument('compute_subnet_id', type=str, help='Subnet ID used for computes in workspace', arg_group='Virtual ' 'Network Profile') c.argument('type_', options_list=['--type'], arg_type=get_enum_type(['None', 'SystemAssigned']), help='The ' @@ -768,7 +768,7 @@ def load_arguments(self, _): c.argument('if_match', type=str, help='ETag of the integration runtime entity. Should only be specified for ' 'update, for which it should match existing entity or can be * for unconditional update.') c.argument('properties', type=validate_file_or_dict, help='Integration runtime properties. Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse integration-runtime update') as c: c.argument('resource_group_name', resource_group_name_type) diff --git a/test/scenarios/synapse/output/extnosdknoflattentrack1/src/synapse/azext_synapse/generated/_params.py b/test/scenarios/synapse/output/extnosdknoflattentrack1/src/synapse/azext_synapse/generated/_params.py index 32351b06..fe9defc8 100644 --- a/test/scenarios/synapse/output/extnosdknoflattentrack1/src/synapse/azext_synapse/generated/_params.py +++ b/test/scenarios/synapse/output/extnosdknoflattentrack1/src/synapse/azext_synapse/generated/_params.py @@ -135,7 +135,7 @@ 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('ip_firewall_rules', type=validate_file_or_dict, help='IP firewall rule properties Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse ip-firewall-rule wait') as c: c.argument('resource_group_name', resource_group_name_type) @@ -681,7 +681,7 @@ def load_arguments(self, _): c.argument('managed_virtual_network', type=str, help='Setting this to \'default\' will ensure that all compute ' 'for this workspace is in a virtual network managed on behalf of the user.') c.argument('private_endpoint_connections', type=validate_file_or_dict, help='Private endpoint connections to ' - 'the workspace Expected value: json-string/@json-file.') + 'the workspace Expected value: json-string/json-file/@json-file.') c.argument('compute_subnet_id', type=str, help='Subnet ID used for computes in workspace', arg_group='Virtual ' 'Network Profile') c.argument('type_', options_list=['--type'], arg_type=get_enum_type(['None', 'SystemAssigned']), help='The ' @@ -773,7 +773,7 @@ def load_arguments(self, _): c.argument('if_match', type=str, help='ETag of the integration runtime entity. Should only be specified for ' 'update, for which it should match existing entity or can be * for unconditional update.') c.argument('properties', type=validate_file_or_dict, help='Integration runtime properties. Expected value: ' - 'json-string/@json-file.') + 'json-string/json-file/@json-file.') with self.argument_context('synapse integration-runtime update') as c: c.argument('resource_group_name', resource_group_name_type)