Fix string bug in windows (#480)

src/plugins/azgenerator/TemplateAzureCliCustom.ts

@@ -484,13 +484,7 @@ function GetPolyMethodCall(model: CodeModelAz, prefix: any, originalOperation: O
                 parameterPair = model.Parameter_NamePython(param) + "=None";
             }
         } else {
-            if(model.Parameter_Type(param) == SchemaType.Integer) {
-                parameterPair = parameterName + "=int(" + optionName + ")";
-            } else if(model.Parameter_Type(param) == SchemaType.Number) {
-                parameterPair = parameterName + "=float(" + optionName + ")";
-            } else {
-                parameterPair = parameterName + "=" + optionName;
-            }
+            parameterPair = parameterName + "=" + optionName;
         }
         
 
@@ -567,13 +561,7 @@ function GetMethodCall(model: CodeModelAz, required: any, prefix: any): string[]
                 }
             }
             else {
-                if(model.MethodParameter_Type == SchemaType.Integer) {
-                    parameterPair = model.MethodParameter_NamePython + "=int(" + model.MethodParameter_MapsTo + ")";
-                } else if(model.MethodParameter_Type == SchemaType.Number) {
-                    parameterPair = model.MethodParameter_NamePython + "=float(" + model.MethodParameter_MapsTo + ")";
-                } else {
-                    parameterPair = model.MethodParameter_NamePython + "=" + model.MethodParameter_MapsTo;
-                }
+                parameterPair = model.MethodParameter_NamePython + "=" + model.MethodParameter_MapsTo;
             }
 
             if (methodCall.endsWith("(")) {

src/plugins/azgenerator/TemplateAzureCliParams.ts

@@ -288,6 +288,14 @@ function getCommandBody(model: CodeModelAz, needGeneric: boolean = false, debug:
                     }
 
                     if (!needSkip) {
+                        if (model.MethodParameter_Type == SchemaType.Integer) {
+                            argument += ", type=int"
+                        } else if(model.MethodParameter_Type == SchemaType.Number) {
+                            argument += ", type=float"
+                        } else if(model.MethodParameter_Type == SchemaType.String) {
+                            argument += ", type=str"
+                        }
+                        
                         argument += ", help='" + EscapeString(model.MethodParameter_Description).trimRight();
                         if (model.MethodParameter_IsList && !model.MethodParameter_IsSimpleArray) {
                             let netDescription = model.MethodParameter_Description.trim();

src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/_params.py

@@ -23,11 +23,11 @@ def load_arguments(self, _):
 
     with self.argument_context('attestation create-provider') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service')
+        c.argument('provider_name', type=str, help='Name of the attestation service')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('tags', tags_type)
-        c.argument('attestation_policy', help='Name of attestation policy.')
+        c.argument('attestation_policy', type=str, help='Name of attestation policy.')
         c.argument('policy_signing_certificates_keys', action=AddPolicySigningCertificatesKeys, nargs='*', help='The '
                    'value of the "keys" parameter is an array of JWK values.  By default, the order of the JWK values '
                    'within the array does not imply an order of preference among them, although applications of JWK '
@@ -38,13 +38,13 @@ def load_arguments(self, _):
 
     with self.argument_context('attestation attestation-provider show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service instance', id_part='name')
+        c.argument('provider_name', type=str, help='Name of the attestation service instance', id_part='name')
 
     with self.argument_context('attestation attestation-provider update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service', id_part='name')
+        c.argument('provider_name', type=str, help='Name of the attestation service', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('attestation attestation-provider delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service', id_part='name')
+        c.argument('provider_name', type=str, help='Name of the attestation service', id_part='name')

src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/generated/_params.py

@@ -34,15 +34,15 @@ def load_arguments(self, _):
 
     with self.argument_context('datafactory show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', options_list=['--name', '-n'], help='The factory name.', id_part='name')
-        c.argument('if_none_match', help='ETag of the factory entity. Should only be specified for get. If the ETag '
-                   'matches the existing entity tag, or if * was provided, then no content will be returned.')
+        c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name')
+        c.argument('if_none_match', type=str, help='ETag of the factory entity. Should only be specified for get. If '
+                   'the ETag matches the existing entity tag, or if * was provided, then no content will be returned.')
 
     with self.argument_context('datafactory create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', options_list=['--name', '-n'], help='The factory name.')
-        c.argument('if_match', help='ETag of the factory entity. Should only be specified for update, for which it '
-                   'should match existing entity or can be * for unconditional update.')
+        c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.')
+        c.argument('if_match', type=str, help='ETag of the factory entity. Should only be specified for update, for '
+                   'which it should match existing entity or can be * for unconditional update.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('tags', tags_type)
@@ -55,16 +55,16 @@ def load_arguments(self, _):
 
     with self.argument_context('datafactory update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', options_list=['--name', '-n'], help='The factory name.', id_part='name')
+        c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('datafactory delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', options_list=['--name', '-n'], help='The factory name.', id_part='name')
+        c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name')
 
     with self.argument_context('datafactory configure-factory-repo') as c:
-        c.argument('location_id', help='The location identifier.', id_part='name')
-        c.argument('factory_resource_id', help='The factory resource id.')
+        c.argument('location_id', type=str, help='The location identifier.', id_part='name')
+        c.argument('factory_resource_id', type=str, help='The factory resource id.')
         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 '
@@ -72,131 +72,143 @@ def load_arguments(self, _):
 
     with self.argument_context('datafactory get-data-plane-access') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', options_list=['--name', '-n'], help='The factory name.', id_part='name')
-        c.argument('permissions', help='The string with permissions for Data Plane access. Currently only \'r\' is '
-                   'supported which grants read only access.')
-        c.argument('access_resource_path', help='The resource path to get access relative to factory. Currently only '
-                   'empty string is supported which corresponds to the factory resource.')
-        c.argument('profile_name', help='The name of the profile. Currently only the default is supported. The default '
-                   'value is DefaultProfile.')
-        c.argument('start_time', help='Start time for the token. If not specified the current time will be used.')
-        c.argument('expire_time', help='Expiration time for the token. Maximum duration for the token is eight hours '
-                   'and by default the token will expire in eight hours.')
+        c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name')
+        c.argument('permissions', type=str, help='The string with permissions for Data Plane access. Currently only '
+                   '\'r\' is supported which grants read only access.')
+        c.argument('access_resource_path', type=str, help='The resource path to get access relative to factory. '
+                   'Currently only empty string is supported which corresponds to the factory resource.')
+        c.argument('profile_name', type=str, help='The name of the profile. Currently only the default is supported. '
+                   'The default value is DefaultProfile.')
+        c.argument('start_time', type=str, help='Start time for the token. If not specified the current time will be '
+                   'used.')
+        c.argument('expire_time', type=str, help='Expiration time for the token. Maximum duration for the token is '
+                   'eight hours and by default the token will expire in eight hours.')
 
     with self.argument_context('datafactory get-git-hub-access-token') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', options_list=['--name', '-n'], help='The factory name.', id_part='name')
-        c.argument('git_hub_access_code', help='GitHub access code.')
-        c.argument('git_hub_client_id', help='GitHub application client ID.')
-        c.argument('git_hub_access_token_base_url', help='GitHub access token base URL.')
+        c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name')
+        c.argument('git_hub_access_code', type=str, help='GitHub access code.')
+        c.argument('git_hub_client_id', type=str, help='GitHub application client ID.')
+        c.argument('git_hub_access_token_base_url', type=str, help='GitHub access token base URL.')
 
     with self.argument_context('datafactory trigger list') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.')
+        c.argument('factory_name', type=str, help='The factory name.')
 
     with self.argument_context('datafactory trigger show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
-        c.argument('if_none_match', help='ETag of the trigger entity. Should only be specified for get. If the ETag '
-                   'matches the existing entity tag, or if * was provided, then no content will be returned.')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
+        c.argument('if_none_match', type=str, help='ETag of the trigger entity. Should only be specified for get. If '
+                   'the ETag matches the existing entity tag, or if * was provided, then no content will be returned.')
 
     with self.argument_context('datafactory trigger create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.')
-        c.argument('if_match', 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('factory_name', type=str, help='The factory name.')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.')
+        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.')
 
     with self.argument_context('datafactory trigger update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
-        c.argument('if_match', 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('description', help='Trigger description.')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
+        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('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.')
         c.ignore('properties')
 
     with self.argument_context('datafactory trigger delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
 
     with self.argument_context('datafactory trigger get-event-subscription-status') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
 
     with self.argument_context('datafactory trigger query-by-factory') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('continuation_token', help='The continuation token for getting the next page of results. Null for '
-                   'first page.')
-        c.argument('parent_trigger_name', help='The name of the parent TumblingWindowTrigger to get the child rerun '
-                   'triggers')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('continuation_token', type=str, help='The continuation token for getting the next page of results. '
+                   'Null for first page.')
+        c.argument('parent_trigger_name', type=str, help='The name of the parent TumblingWindowTrigger to get the '
+                   'child rerun triggers')
 
     with self.argument_context('datafactory trigger start') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
 
     with self.argument_context('datafactory trigger stop') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
 
     with self.argument_context('datafactory trigger subscribe-to-event') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
 
     with self.argument_context('datafactory trigger unsubscribe-from-event') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
 
     with self.argument_context('datafactory trigger wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('trigger_name', options_list=['--name', '-n'], help='The trigger name.', id_part='child_name_1')
-        c.argument('if_none_match', help='ETag of the trigger entity. Should only be specified for get. If the ETag '
-                   'matches the existing entity tag, or if * was provided, then no content will be returned.')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('trigger_name', options_list=['--name', '-n'], type=str, help='The trigger name.', id_part=''
+                   'child_name_1')
+        c.argument('if_none_match', type=str, help='ETag of the trigger entity. Should only be specified for get. If '
+                   'the ETag matches the existing entity tag, or if * was provided, then no content will be returned.')
 
     with self.argument_context('datafactory integration-runtime list') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.')
+        c.argument('factory_name', type=str, help='The factory name.')
 
     with self.argument_context('datafactory integration-runtime show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
-        c.argument('if_none_match', help='ETag of the integration runtime entity. Should only be specified for get. If '
-                   'the ETag matches the existing entity tag, or if * was provided, then no content will be returned.')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
+        c.argument('if_none_match', type=str, help='ETag of the integration runtime entity. Should only be specified '
+                   'for get. If the ETag matches the existing entity tag, or if * was provided, then no content will '
+                   'be returned.')
 
     with self.argument_context('datafactory integration-runtime linked-integration-runtime create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.')
-        c.argument('integration_runtime_name', help='The integration runtime name.')
-        c.argument('name', help='The name of the linked integration runtime.')
-        c.argument('subscription_id',
-                   help='The ID of the subscription that the linked integration runtime belongs to.')
-        c.argument('data_factory_name', help='The name of the data factory that the linked integration runtime belongs '
-                   'to.')
-        c.argument('data_factory_location', help='The location of the data factory that the linked integration runtime '
+        c.argument('factory_name', type=str, help='The factory name.')
+        c.argument('integration_runtime_name', type=str, help='The integration runtime name.')
+        c.argument('name', type=str, help='The name of the linked integration runtime.')
+        c.argument('subscription_id', type=str, help='The ID of the subscription that the linked integration runtime '
                    'belongs to.')
+        c.argument('data_factory_name', type=str, help='The name of the data factory that the linked integration '
+                   'runtime belongs to.')
+        c.argument('data_factory_location', type=str, help='The location of the data factory that the linked '
+                   'integration runtime belongs to.')
 
     with self.argument_context('datafactory integration-runtime managed create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.')
-        c.argument('if_match', 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('description', help='Integration runtime description.')
+        c.argument('factory_name', type=str, help='The factory name.')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.')
+        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('description', type=str, help='Integration runtime description.')
         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 '
@@ -210,97 +222,100 @@ def load_arguments(self, _):
 
     with self.argument_context('datafactory integration-runtime self-hosted create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.')
-        c.argument('if_match', 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('description', help='Integration runtime description.')
+        c.argument('factory_name', type=str, help='The factory name.')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.')
+        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('description', type=str, help='Integration runtime description.')
         c.argument('type_properties_linked_info', type=validate_file_or_dict, help='The base definition of a linked '
                    'integration runtime. Expected value: json-string/@json-file.')
 
     with self.argument_context('datafactory integration-runtime update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
         c.argument('auto_update', arg_type=get_enum_type(['On', 'Off']), help='Enables or disables the auto-update '
                    'feature of the self-hosted integration runtime. See https://go.microsoft.com/fwlink/?linkid=854189.'
                    '')
-        c.argument('update_delay_offset', help='The time offset (in hours) in the day, e.g., PT03H is 3 hours. The '
-                   'integration runtime auto update will happen on that time.')
+        c.argument('update_delay_offset', type=str, help='The time offset (in hours) in the day, e.g., PT03H is 3 '
+                   'hours. The integration runtime auto update will happen on that time.')
 
     with self.argument_context('datafactory integration-runtime delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime get-connection-info') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime get-monitoring-data') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime get-status') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime list-auth-key') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.')
+        c.argument('factory_name', type=str, help='The factory name.')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.')
 
     with self.argument_context('datafactory integration-runtime regenerate-auth-key') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
         c.argument('key_name', arg_type=get_enum_type(['authKey1', 'authKey2']), help='The name of the authentication '
                    'key to regenerate.')
 
     with self.argument_context('datafactory integration-runtime remove-link') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
-        c.argument('linked_factory_name', help='The data factory name for linked integration runtime.')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
+        c.argument('linked_factory_name', type=str, help='The data factory name for linked integration runtime.')
 
     with self.argument_context('datafactory integration-runtime start') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime stop') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime sync-credentials') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime upgrade') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
 
     with self.argument_context('datafactory integration-runtime wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('factory_name', help='The factory name.', id_part='name')
-        c.argument('integration_runtime_name', options_list=['--name', '-n'], help='The integration runtime name.',
-                   id_part='child_name_1')
-        c.argument('if_none_match', help='ETag of the integration runtime entity. Should only be specified for get. If '
-                   'the ETag matches the existing entity tag, or if * was provided, then no content will be returned.')
+        c.argument('factory_name', type=str, help='The factory name.', id_part='name')
+        c.argument('integration_runtime_name', options_list=['--name', '-n'], type=str, help='The integration runtime '
+                   'name.', id_part='child_name_1')
+        c.argument('if_none_match', type=str, help='ETag of the integration runtime entity. Should only be specified '
+                   'for get. If the ETag matches the existing entity tag, or if * was provided, then no content will '
+                   'be returned.')

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

@@ -33,14 +33,15 @@ def load_arguments(self, _):
 
     with self.argument_context('managed-network mn list') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('top', help='May be used to limit the number of results in a page for list queries.')
-        c.argument('skiptoken', help='Skiptoken is only used if a previous operation returned a partial result. If a '
-                   'previous response contains a nextLink element, the value of the nextLink element will include a '
-                   'skiptoken parameter that specifies a starting point to use for subsequent calls.')
+        c.argument('top', type=int, help='May be used to limit the number of results in a page for list queries.')
+        c.argument('skiptoken', type=str, help='Skiptoken is only used if a previous operation returned a partial '
+                   'result. If a previous response contains a nextLink element, the value of the nextLink element will '
+                   'include a skiptoken parameter that specifies a starting point to use for subsequent calls.')
 
     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'], help='The name of the Managed Network.')
+        c.argument('managed_network_name', options_list=['--name', '-n'], 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)
@@ -49,72 +50,74 @@ 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'], help='The name of the Managed Network.',
-                   id_part='name')
+        c.argument('managed_network_name', options_list=['--name', '-n'], 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'], help='The name of the Managed Network.',
-                   id_part='name')
+        c.argument('managed_network_name', options_list=['--name', '-n'], 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'], help='The name of the Managed Network.',
-                   id_part='name')
+        c.argument('managed_network_name', options_list=['--name', '-n'], 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', help='The base resource of the scope assignment.')
+        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', help='The base resource of the scope assignment.')
-        c.argument('scope_assignment_name', options_list=['--name', '-n'], help='The name of the scope assignment to '
-                   'get.')
+        c.argument('scope', type=str, help='The base resource of the scope assignment.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n'], 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', help='The base resource of the scope assignment to create. The scope can be any REST '
-                   'resource instance. For example, use \'subscriptions/{subscription-id}\' for a subscription, '
+        c.argument('scope', type=str, help='The base resource of the scope assignment to create. The scope can be any '
+                   'REST resource instance. For example, use \'subscriptions/{subscription-id}\' for a subscription, '
                    '\'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'], help='The name of the scope assignment to '
-                   'create.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n'], 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', help='The managed network ID with scope will be assigned to.')
+        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 update') as c:
-        c.argument('scope', help='The base resource of the scope assignment to create. The scope can be any REST '
-                   'resource instance. For example, use \'subscriptions/{subscription-id}\' for a subscription, '
+        c.argument('scope', type=str, help='The base resource of the scope assignment to create. The scope can be any '
+                   'REST resource instance. For example, use \'subscriptions/{subscription-id}\' for a subscription, '
                    '\'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'], help='The name of the scope assignment to '
-                   'create.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n'], 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', help='The managed network ID with scope will be assigned to.')
+        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', help='The scope of the scope assignment to delete.')
-        c.argument('scope_assignment_name', options_list=['--name', '-n'], help='The name of the scope assignment to '
-                   'delete.')
+        c.argument('scope', type=str, help='The scope of the scope assignment to delete.')
+        c.argument('scope_assignment_name', options_list=['--name', '-n'], 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)
-        c.argument('managed_network_name', help='The name of the Managed Network.')
-        c.argument('top', help='May be used to limit the number of results in a page for list queries.')
-        c.argument('skiptoken', help='Skiptoken is only used if a previous operation returned a partial result. If a '
-                   'previous response contains a nextLink element, the value of the nextLink element will include a '
-                   'skiptoken parameter that specifies a starting point to use for subsequent calls.')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.')
+        c.argument('top', type=int, help='May be used to limit the number of results in a page for list queries.')
+        c.argument('skiptoken', type=str, help='Skiptoken is only used if a previous operation returned a partial '
+                   'result. If a previous response contains a nextLink element, the value of the nextLink element will '
+                   'include a skiptoken parameter that specifies a starting point to use for subsequent calls.')
 
     with self.argument_context('managed-network mn group show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', help='The name of the Managed Network.', id_part='name')
-        c.argument('group_name', help='The name of the Managed Network Group.', id_part='child_name_1')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
+        c.argument('group_name', type=str, help='The name of the Managed Network Group.', id_part='child_name_1')
 
     with self.argument_context('managed-network mn group create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', help='The name of the Managed Network.')
-        c.argument('group_name', help='The name of the Managed Network Group.')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.')
+        c.argument('group_name', type=str, help='The name of the Managed Network Group.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('management_groups', type=validate_file_or_dict, help='The collection of management groups covered '
@@ -128,8 +131,8 @@ def load_arguments(self, _):
 
     with self.argument_context('managed-network mn group update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', help='The name of the Managed Network.', id_part='name')
-        c.argument('group_name', help='The name of the Managed Network Group.', id_part='child_name_1')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
+        c.argument('group_name', type=str, help='The name of the Managed Network Group.', 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('management_groups', type=validate_file_or_dict, help='The collection of management groups covered '
@@ -143,31 +146,32 @@ def load_arguments(self, _):
 
     with self.argument_context('managed-network mn group delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', help='The name of the Managed Network.', id_part='name')
-        c.argument('group_name', help='The name of the Managed Network Group.', id_part='child_name_1')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
+        c.argument('group_name', type=str, help='The name of the Managed Network Group.', id_part='child_name_1')
 
     with self.argument_context('managed-network mn group wait') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', help='The name of the Managed Network.', id_part='name')
-        c.argument('group_name', help='The name of the Managed Network Group.', id_part='child_name_1')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.', id_part='name')
+        c.argument('group_name', type=str, help='The name of the Managed Network Group.', id_part='child_name_1')
 
     with self.argument_context('managed-network managed-network-peering-policy list') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', help='The name of the Managed Network.')
-        c.argument('top', help='May be used to limit the number of results in a page for list queries.')
-        c.argument('skiptoken', help='Skiptoken is only used if a previous operation returned a partial result. If a '
-                   'previous response contains a nextLink element, the value of the nextLink element will include a '
-                   'skiptoken parameter that specifies a starting point to use for subsequent calls.')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.')
+        c.argument('top', type=int, help='May be used to limit the number of results in a page for list queries.')
+        c.argument('skiptoken', type=str, help='Skiptoken is only used if a previous operation returned a partial '
+                   'result. If a previous response contains a nextLink element, the value of the nextLink element will '
+                   'include a skiptoken parameter that specifies a starting point to use for subsequent calls.')
 
     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', help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', 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')
+        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)
-        c.argument('managed_network_name', help='The name of the Managed Network.')
-        c.argument('policy_name', help='The name of the Managed Network Peering Policy.')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.')
+        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.')
         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')
@@ -176,8 +180,8 @@ def load_arguments(self, _):
 
     with self.argument_context('managed-network managed-network-peering-policy mesh-topology create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('managed_network_name', help='The name of the Managed Network.')
-        c.argument('policy_name', help='The name of the Managed Network Peering Policy.')
+        c.argument('managed_network_name', type=str, help='The name of the Managed Network.')
+        c.argument('policy_name', type=str, help='The name of the Managed Network Peering Policy.')
         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')
@@ -186,8 +190,9 @@ 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', help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', 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')
+        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')
@@ -197,8 +202,9 @@ 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', help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', 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')
+        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')
@@ -208,10 +214,12 @@ 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', help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', 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')
+        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', help='The name of the Managed Network.', id_part='name')
-        c.argument('policy_name', 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')
+        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/custom.py

@@ -19,9 +19,9 @@ def managed_network_mn_list(client,
                             skiptoken=None):
     if resource_group_name:
         return client.list_by_resource_group(resource_group_name=resource_group_name,
-                                             top=int(top),
+                                             top=top,
                                              skiptoken=skiptoken)
-    return client.list_by_subscription(top=int(top),
+    return client.list_by_subscription(top=top,
                                        skiptoken=skiptoken)
 
 
@@ -109,7 +109,7 @@ def managed_network_mn_group_list(client,
                                   skiptoken=None):
     return client.list_by_managed_network(resource_group_name=resource_group_name,
                                           managed_network_name=managed_network_name,
-                                          top=int(top),
+                                          top=top,
                                           skiptoken=skiptoken)
 
 
@@ -185,7 +185,7 @@ def managed_network_managed_network_peering_policy_list(client,
                                                         skiptoken=None):
     return client.list_by_managed_network(resource_group_name=resource_group_name,
                                           managed_network_name=managed_network_name,
-                                          top=int(top),
+                                          top=top,
                                           skiptoken=skiptoken)