diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py index 8af3333b2e..cb7ccec1b0 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py @@ -25,39 +25,23 @@ class AutoRestDurationTestServiceConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'https://localhost' - super(AutoRestDurationTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestDurationTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestdurationtestservice/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestDurationTestService(object): @@ -72,24 +56,13 @@ class AutoRestDurationTestService(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestDurationTestServiceConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestDurationTestServiceConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py index 16515125fa..f0742327c8 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py index 352675fde4..d87733aa5f 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py @@ -25,39 +25,23 @@ class AutoRestParameterGroupingTestServiceConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'https://localhost' - super(AutoRestParameterGroupingTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestParameterGroupingTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestparametergroupingtestservice/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestParameterGroupingTestService(object): @@ -72,24 +56,13 @@ class AutoRestParameterGroupingTestService(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestParameterGroupingTestServiceConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestParameterGroupingTestServiceConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py index c307c1e77a..3ba6610db9 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py index cfcb399af2..62d0d5eb16 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py @@ -26,39 +26,23 @@ class AutoRestReportServiceForAzureConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'http://localhost' - super(AutoRestReportServiceForAzureConfiguration, self).__init__(base_url, filepath) + super(AutoRestReportServiceForAzureConfiguration, self).__init__(base_url) self.add_user_agent('autorestreportserviceforazure/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestReportServiceForAzure(object): @@ -70,24 +54,13 @@ class AutoRestReportServiceForAzure(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestReportServiceForAzureConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestReportServiceForAzureConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/setup.py index d8c4a98051..8bfaae406e 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureReport/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py index fe5d1e1672..2e0c8573a6 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py @@ -26,39 +26,23 @@ class AutoRestResourceFlatteningTestServiceConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'http://localhost' - super(AutoRestResourceFlatteningTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestResourceFlatteningTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestresourceflatteningtestservice/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestResourceFlatteningTestService(object): @@ -70,24 +54,13 @@ class AutoRestResourceFlatteningTestService(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestResourceFlatteningTestServiceConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestResourceFlatteningTestServiceConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/setup.py index e06838f4ce..ab4b11b50a 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureResource/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py index 3e394c337c..4c5b79e472 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py @@ -38,22 +38,11 @@ class AutoRestAzureSpecialParametersTestClientConfiguration(AzureConfiguration): :param api_version: The api version, which appears in the query, the value is always '2015-07-01-preview' :type api_version: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, subscription_id, api_version='2015-07-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, subscription_id, api_version='2015-07-01-preview', base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") @@ -63,12 +52,10 @@ def __init__( raise TypeError("Parameter 'subscription_id' must be str.") if api_version is not None and not isinstance(api_version, str): raise TypeError("Optional parameter 'api_version' must be str.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'http://localhost' - super(AutoRestAzureSpecialParametersTestClientConfiguration, self).__init__(base_url, filepath) + super(AutoRestAzureSpecialParametersTestClientConfiguration, self).__init__(base_url) self.add_user_agent('autorestazurespecialparameterstestclient/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') @@ -76,9 +63,6 @@ def __init__( self.credentials = credentials self.subscription_id = subscription_id self.api_version = api_version - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestAzureSpecialParametersTestClient(object): @@ -113,24 +97,13 @@ class AutoRestAzureSpecialParametersTestClient(object): :param api_version: The api version, which appears in the query, the value is always '2015-07-01-preview' :type api_version: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, subscription_id, api_version='2015-07-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, subscription_id, api_version='2015-07-01-preview', base_url=None): - self.config = AutoRestAzureSpecialParametersTestClientConfiguration(credentials, subscription_id, api_version, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestAzureSpecialParametersTestClientConfiguration(credentials, subscription_id, api_version, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py index 0265eef74b..e62dfb8dca 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py index d9414adf1d..62c376e9a8 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py @@ -28,21 +28,10 @@ class AutoRestParameterizedHostTestClientConfiguration(AzureConfiguration): :param host: A string value that is used as a global part of the parameterized host :type host: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool - :param str filepath: Existing config """ def __init__( - self, credentials, host, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, filepath=None): + self, credentials, host): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") @@ -50,20 +39,15 @@ def __init__( raise ValueError("Parameter 'host' must not be None.") if not isinstance(host, str): raise TypeError("Parameter 'host' must be str.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") base_url = 'http://{accountName}{host}' - super(AutoRestParameterizedHostTestClientConfiguration, self).__init__(base_url, filepath) + super(AutoRestParameterizedHostTestClientConfiguration, self).__init__(base_url) self.add_user_agent('autorestparameterizedhosttestclient/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials self.host = host - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestParameterizedHostTestClient(object): @@ -81,23 +65,12 @@ class AutoRestParameterizedHostTestClient(object): :param host: A string value that is used as a global part of the parameterized host :type host: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool - :param str filepath: Existing config """ def __init__( - self, credentials, host, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, filepath=None): + self, credentials, host): - self.config = AutoRestParameterizedHostTestClientConfiguration(credentials, host, accept_language, long_running_operation_retry_timeout, generate_client_request_id, filepath) + self.config = AutoRestParameterizedHostTestClientConfiguration(credentials, host) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py index f82dd8c0f7..791c6c71aa 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py index 23fbb7fd1a..f43736b101 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py @@ -24,39 +24,23 @@ class AutoRestHeadTestServiceConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'http://localhost' - super(AutoRestHeadTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestHeadTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestheadtestservice/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestHeadTestService(object): @@ -71,24 +55,13 @@ class AutoRestHeadTestService(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestHeadTestServiceConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestHeadTestServiceConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/setup.py index b649cbc67b..2b7b9d8e3b 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Head/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py index 6f43da7a0a..2ac1b8d6e6 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py @@ -24,39 +24,23 @@ class AutoRestHeadExceptionTestServiceConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'http://localhost' - super(AutoRestHeadExceptionTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestHeadExceptionTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestheadexceptiontestservice/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestHeadExceptionTestService(object): @@ -71,24 +55,13 @@ class AutoRestHeadExceptionTestService(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestHeadExceptionTestServiceConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestHeadExceptionTestServiceConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py index 3afd098a07..2ffea8c984 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py index f5c00edb82..d12a86972a 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py @@ -28,39 +28,23 @@ class AutoRestLongRunningOperationTestServiceConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'http://localhost' - super(AutoRestLongRunningOperationTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestLongRunningOperationTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestlongrunningoperationtestservice/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestLongRunningOperationTestService(object): @@ -81,24 +65,13 @@ class AutoRestLongRunningOperationTestService(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestLongRunningOperationTestServiceConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestLongRunningOperationTestServiceConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/setup.py index 0c397ad78e..6153141a5a 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Lro/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py index 9cf0c1c8e7..cf52c3554f 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py @@ -25,39 +25,23 @@ class AutoRestPagingTestServiceConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'http://localhost' - super(AutoRestPagingTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestPagingTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestpagingtestservice/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class AutoRestPagingTestService(object): @@ -72,24 +56,13 @@ class AutoRestPagingTestService(object): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, base_url=None): - self.config = AutoRestPagingTestServiceConfiguration(credentials, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = AutoRestPagingTestServiceConfiguration(credentials, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/setup.py index 69e7afeb32..92f73d9a35 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/Paging/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py index b27c6048bb..3dd6dc2591 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py index 2198ff47af..7b0b9f8775 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py @@ -32,22 +32,11 @@ class StorageManagementClientConfiguration(AzureConfiguration): :type subscription_id: str :param api_version: Client Api Version. :type api_version: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, subscription_id, api_version='2015-05-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, subscription_id, api_version='2015-05-01-preview', base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") @@ -57,12 +46,10 @@ def __init__( raise TypeError("Parameter 'subscription_id' must be str.") if api_version is not None and not isinstance(api_version, str): raise TypeError("Optional parameter 'api_version' must be str.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'https://management.azure.com' - super(StorageManagementClientConfiguration, self).__init__(base_url, filepath) + super(StorageManagementClientConfiguration, self).__init__(base_url) self.add_user_agent('storagemanagementclient/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') @@ -70,9 +57,6 @@ def __init__( self.credentials = credentials self.subscription_id = subscription_id self.api_version = api_version - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class StorageManagementClient(object): @@ -95,24 +79,13 @@ class StorageManagementClient(object): :type subscription_id: str :param api_version: Client Api Version. :type api_version: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, subscription_id, api_version='2015-05-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, subscription_id, api_version='2015-05-01-preview', base_url=None): - self.config = StorageManagementClientConfiguration(credentials, subscription_id, api_version, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = StorageManagementClientConfiguration(credentials, subscription_id, api_version, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py index a4b9d8c7ed..0ac70759d2 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py @@ -29,22 +29,11 @@ class MicrosoftAzureTestUrlConfiguration(AzureConfiguration): :type subscription_id: str :param api_version: API Version with value '2014-04-01-preview'. :type api_version: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, subscription_id, api_version='2014-04-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, subscription_id, api_version='2014-04-01-preview', base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") @@ -54,12 +43,10 @@ def __init__( raise TypeError("Parameter 'subscription_id' must be str.") if api_version is not None and not isinstance(api_version, str): raise TypeError("Optional parameter 'api_version' must be str.") - if accept_language is not None and not isinstance(accept_language, str): - raise TypeError("Optional parameter 'accept_language' must be str.") if not base_url: base_url = 'https://management.azure.com/' - super(MicrosoftAzureTestUrlConfiguration, self).__init__(base_url, filepath) + super(MicrosoftAzureTestUrlConfiguration, self).__init__(base_url) self.add_user_agent('microsoftazuretesturl/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') @@ -67,9 +54,6 @@ def __init__( self.credentials = credentials self.subscription_id = subscription_id self.api_version = api_version - self.accept_language = accept_language - self.long_running_operation_retry_timeout = long_running_operation_retry_timeout - self.generate_client_request_id = generate_client_request_id class MicrosoftAzureTestUrl(object): @@ -88,24 +72,13 @@ class MicrosoftAzureTestUrl(object): :type subscription_id: str :param api_version: API Version with value '2014-04-01-preview'. :type api_version: str - :param accept_language: Gets or sets the preferred language for the - response. - :type accept_language: str - :param long_running_operation_retry_timeout: Gets or sets the retry - timeout in seconds for Long Running Operations. Default value is 30. - :type long_running_operation_retry_timeout: int - :param generate_client_request_id: When set to true a unique - x-ms-client-request-id value is generated and included in each request. - Default is true. - :type generate_client_request_id: bool :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, credentials, subscription_id, api_version='2014-04-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None): + self, credentials, subscription_id, api_version='2014-04-01-preview', base_url=None): - self.config = MicrosoftAzureTestUrlConfiguration(credentials, subscription_id, api_version, accept_language, long_running_operation_retry_timeout, generate_client_request_id, base_url, filepath) + self.config = MicrosoftAzureTestUrlConfiguration(credentials, subscription_id, api_version, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py index 940ccab416..537de682e0 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py +++ b/src/generator/AutoRest.Python.Azure.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.4.0", "msrestazure>=0.4.0"] +REQUIRES = ["msrestazure>=0.4.7"] setup( name=NAME, diff --git a/src/generator/AutoRest.Python.Azure.Tests/requirements.txt b/src/generator/AutoRest.Python.Azure.Tests/requirements.txt index 136714263b..08f0866376 100644 --- a/src/generator/AutoRest.Python.Azure.Tests/requirements.txt +++ b/src/generator/AutoRest.Python.Azure.Tests/requirements.txt @@ -1,2 +1,2 @@ requests==2.10.0 -msrestazure==0.4.3 \ No newline at end of file +msrestazure==0.4.7 \ No newline at end of file diff --git a/src/generator/AutoRest.Python.Azure/CodeGeneratorPya.cs b/src/generator/AutoRest.Python.Azure/CodeGeneratorPya.cs index 15f66ebd09..663ed40ac7 100644 --- a/src/generator/AutoRest.Python.Azure/CodeGeneratorPya.cs +++ b/src/generator/AutoRest.Python.Azure/CodeGeneratorPya.cs @@ -17,7 +17,7 @@ namespace AutoRest.Python.Azure { public class CodeGeneratorPya : CodeGeneratorPy { - private const string ClientRuntimePackage = "msrestazure version 0.4.0"; + private const string ClientRuntimePackage = "msrestazure version 0.4.7"; public override string UsageInstructions => string.Format(CultureInfo.InvariantCulture, Resources.UsageInformation, ClientRuntimePackage); diff --git a/src/generator/AutoRest.Python.Azure/Model/CodeModelPya.cs b/src/generator/AutoRest.Python.Azure/Model/CodeModelPya.cs index 39c45427c9..04b0f538f6 100644 --- a/src/generator/AutoRest.Python.Azure/Model/CodeModelPya.cs +++ b/src/generator/AutoRest.Python.Azure/Model/CodeModelPya.cs @@ -63,13 +63,13 @@ public override string RequiredConstructorParameters var param = string.Join(", ", requireParams); if (!string.IsNullOrEmpty(param)) { - param += ", "; + param = ", " + param; } return param; } } - public override string SetupRequires => "\"msrest>=0.4.0\", \"msrestazure>=0.4.0\""; + public override string SetupRequires => "\"msrestazure>=0.4.7\""; public override bool NeedsExtraImport => true; diff --git a/src/generator/AutoRest.Python.Azure/Templates/AzureServiceClientTemplate.cshtml b/src/generator/AutoRest.Python.Azure/Templates/AzureServiceClientTemplate.cshtml index b40eca0b2c..c3283bb30b 100644 --- a/src/generator/AutoRest.Python.Azure/Templates/AzureServiceClientTemplate.cshtml +++ b/src/generator/AutoRest.Python.Azure/Templates/AzureServiceClientTemplate.cshtml @@ -65,11 +65,10 @@ class @(Model.Name)Configuration(AzureConfiguration): { @: :param str base_url: Service URL } - :param str filepath: Existing config """ @EmptyLine def __init__( - self, @(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : "base_url=None, ")filepath=None): + self@(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : ", base_url=None")): @EmptyLine @Model.ValidateRequiredParameters @@ -84,7 +83,7 @@ else } @EmptyLine - super(@(Model.Name)Configuration, self).__init__(base_url, filepath) + super(@(Model.Name)Configuration, self).__init__(base_url) @EmptyLine self.add_user_agent('@Model.UserAgent/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') @@ -127,13 +126,12 @@ class @(Model.Name)(object): { @: :param str base_url: Service URL } - :param str filepath: Existing config """ @EmptyLine def __init__( - self, @(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : "base_url=None, ")filepath=None): + self@(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : ", base_url=None")): @EmptyLine - self.config = @(Model.Name)Configuration(@(Model.ConfigConstructorParameters)@(Model.IsCustomBaseUri ? "" : "base_url, ")filepath) + self.config = @(Model.Name)Configuration(@(Model.ConfigConstructorParameters)) self._client = ServiceClient(@(Settings.AddCredentials ? "self.config.credentials" : PythonConstants.None), self.config) @EmptyLine @if (Model.ModelTemplateModels.Any(each => !each.Extensions.ContainsKey(AzureExtensions.ExternalExtension))) diff --git a/src/generator/AutoRest.Python.Azure/TransformerPya.cs b/src/generator/AutoRest.Python.Azure/TransformerPya.cs index ef544dc0e1..3be752e3e4 100644 --- a/src/generator/AutoRest.Python.Azure/TransformerPya.cs +++ b/src/generator/AutoRest.Python.Azure/TransformerPya.cs @@ -32,7 +32,7 @@ public override CodeModelPya TransformCodeModel(CodeModel cm) AzureExtensions.ParseODataExtension(codeModel); SwaggerExtensions.FlattenModels(codeModel); ParameterGroupExtensionHelper.AddParameterGroups(codeModel); - AzureExtensions.AddAzureProperties(codeModel); + AddAzureProperties(codeModel); AzureExtensions.SetDefaultResponses(codeModel); CorrectFilterParameters(codeModel); @@ -119,10 +119,6 @@ private string GetPagingSetting(CodeModelPya codeModel, CompositeType body, Dict } } - if (!ignoreNextLink && !findNextLink) - { - throw new KeyNotFoundException($"Couldn't find the nextLink property specified by extension on operation {methodName} and property {body.SerializedName}"); - } if (!findItem) { throw new KeyNotFoundException("Couldn't find the item property specified by extension"); @@ -239,5 +235,28 @@ var method in serviceClient.Methods.Where(m => m.Extensions.ContainsKey(AzureExt } } } + + /// + /// Creates azure specific properties. + /// + /// + private static void AddAzureProperties(CodeModel codeModel) + { + var acceptLanguage = codeModel.Properties + .FirstOrDefault(p => AzureExtensions.AcceptLanguage.EqualsIgnoreCase(p.SerializedName)); + + AzureExtensions.AddAzureProperties(codeModel); + codeModel.Remove(codeModel.Properties.FirstOrDefault(p => p.Name == "long_running_operation_retry_timeout")); + codeModel.Remove(codeModel.Properties.FirstOrDefault(p => p.Name == "generate_client_request_id")); + codeModel.Remove(codeModel.Properties.FirstOrDefault(p => p.Name == "accept_language")); + + if (acceptLanguage != null) // && acceptLanguage.DefaultValue != "en-US" + { + acceptLanguage.IsReadOnly = true; + acceptLanguage.IsRequired = false; + acceptLanguage.ModelType = New(KnownPrimaryType.String); + codeModel.Add(acceptLanguage); + } + } } } \ No newline at end of file diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyArray/autorestswaggerbatarrayservice/auto_rest_swagger_bat_array_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyArray/autorestswaggerbatarrayservice/auto_rest_swagger_bat_array_service.py index ce96dcda4f..b3c4e2cec5 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyArray/autorestswaggerbatarrayservice/auto_rest_swagger_bat_array_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyArray/autorestswaggerbatarrayservice/auto_rest_swagger_bat_array_service.py @@ -22,16 +22,15 @@ class AutoRestSwaggerBATArrayServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestSwaggerBATArrayServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestSwaggerBATArrayServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestswaggerbatarrayservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestSwaggerBATArrayService(object): :vartype array: .operations.ArrayOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestSwaggerBATArrayServiceConfiguration(base_url, filepath) + self.config = AutoRestSwaggerBATArrayServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyBoolean/autorestbooltestservice/auto_rest_bool_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyBoolean/autorestbooltestservice/auto_rest_bool_test_service.py index 3e545353ac..a2e4846673 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyBoolean/autorestbooltestservice/auto_rest_bool_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyBoolean/autorestbooltestservice/auto_rest_bool_test_service.py @@ -22,16 +22,15 @@ class AutoRestBoolTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestBoolTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestBoolTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestbooltestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestBoolTestService(object): :vartype bool_model: .operations.BoolModelOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestBoolTestServiceConfiguration(base_url, filepath) + self.config = AutoRestBoolTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyByte/autorestswaggerbatbyteservice/auto_rest_swagger_bat_byte_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyByte/autorestswaggerbatbyteservice/auto_rest_swagger_bat_byte_service.py index e9eba2261d..715b993ddf 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyByte/autorestswaggerbatbyteservice/auto_rest_swagger_bat_byte_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyByte/autorestswaggerbatbyteservice/auto_rest_swagger_bat_byte_service.py @@ -22,16 +22,15 @@ class AutoRestSwaggerBATByteServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestSwaggerBATByteServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestSwaggerBATByteServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestswaggerbatbyteservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestSwaggerBATByteService(object): :vartype byte: .operations.ByteOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestSwaggerBATByteServiceConfiguration(base_url, filepath) + self.config = AutoRestSwaggerBATByteServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py index 1c03e912e1..7f826f42c0 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py @@ -31,16 +31,15 @@ class AutoRestComplexTestServiceConfiguration(Configuration): :ivar api_version: API ID. :type api_version: str :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestComplexTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestComplexTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestcomplextestservice/{}'.format(VERSION)) @@ -71,13 +70,12 @@ class AutoRestComplexTestService(object): :vartype readonlyproperty: .operations.ReadonlypropertyOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestComplexTestServiceConfiguration(base_url, filepath) + self.config = AutoRestComplexTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDate/autorestdatetestservice/auto_rest_date_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDate/autorestdatetestservice/auto_rest_date_test_service.py index 8b665ea887..9958bd4288 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDate/autorestdatetestservice/auto_rest_date_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDate/autorestdatetestservice/auto_rest_date_test_service.py @@ -22,16 +22,15 @@ class AutoRestDateTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'https://localhost' - super(AutoRestDateTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestDateTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestdatetestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestDateTestService(object): :vartype date_model: .operations.DateModelOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestDateTestServiceConfiguration(base_url, filepath) + self.config = AutoRestDateTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTime/autorestdatetimetestservice/auto_rest_date_time_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTime/autorestdatetimetestservice/auto_rest_date_time_test_service.py index f51ab11b57..d57bbd5ea5 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTime/autorestdatetimetestservice/auto_rest_date_time_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTime/autorestdatetimetestservice/auto_rest_date_time_test_service.py @@ -22,16 +22,15 @@ class AutoRestDateTimeTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'https://localhost' - super(AutoRestDateTimeTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestDateTimeTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestdatetimetestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestDateTimeTestService(object): :vartype datetime_model: .operations.DatetimeModelOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestDateTimeTestServiceConfiguration(base_url, filepath) + self.config = AutoRestDateTimeTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/autorestrfc1123datetimetestservice/auto_rest_rfc1123_date_time_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/autorestrfc1123datetimetestservice/auto_rest_rfc1123_date_time_test_service.py index b1f09a3c6a..e5179c2b70 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/autorestrfc1123datetimetestservice/auto_rest_rfc1123_date_time_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/autorestrfc1123datetimetestservice/auto_rest_rfc1123_date_time_test_service.py @@ -22,16 +22,15 @@ class AutoRestRFC1123DateTimeTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'https://localhost' - super(AutoRestRFC1123DateTimeTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestRFC1123DateTimeTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestrfc1123datetimetestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestRFC1123DateTimeTestService(object): :vartype datetimerfc1123: .operations.Datetimerfc1123Operations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestRFC1123DateTimeTestServiceConfiguration(base_url, filepath) + self.config = AutoRestRFC1123DateTimeTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDictionary/autorestswaggerbatdictionaryservice/auto_rest_swagger_ba_tdictionary_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDictionary/autorestswaggerbatdictionaryservice/auto_rest_swagger_ba_tdictionary_service.py index 26d72d6808..c7dfd23688 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDictionary/autorestswaggerbatdictionaryservice/auto_rest_swagger_ba_tdictionary_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDictionary/autorestswaggerbatdictionaryservice/auto_rest_swagger_ba_tdictionary_service.py @@ -22,16 +22,15 @@ class AutoRestSwaggerBATdictionaryServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestSwaggerBATdictionaryServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestSwaggerBATdictionaryServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestswaggerbatdictionaryservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestSwaggerBATdictionaryService(object): :vartype dictionary: .operations.DictionaryOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestSwaggerBATdictionaryServiceConfiguration(base_url, filepath) + self.config = AutoRestSwaggerBATdictionaryServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py index 97941c29d7..d94f8c7938 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py @@ -22,16 +22,15 @@ class AutoRestDurationTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'https://localhost' - super(AutoRestDurationTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestDurationTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestdurationtestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestDurationTestService(object): :vartype duration: .operations.DurationOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestDurationTestServiceConfiguration(base_url, filepath) + self.config = AutoRestDurationTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFile/autorestswaggerbatfileservice/auto_rest_swagger_bat_file_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFile/autorestswaggerbatfileservice/auto_rest_swagger_bat_file_service.py index 2b3303f49e..913ff6d540 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFile/autorestswaggerbatfileservice/auto_rest_swagger_bat_file_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFile/autorestswaggerbatfileservice/auto_rest_swagger_bat_file_service.py @@ -22,16 +22,15 @@ class AutoRestSwaggerBATFileServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestSwaggerBATFileServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestSwaggerBATFileServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestswaggerbatfileservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestSwaggerBATFileService(object): :vartype files: .operations.FilesOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestSwaggerBATFileServiceConfiguration(base_url, filepath) + self.config = AutoRestSwaggerBATFileServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFormData/autorestswaggerbatformdataservice/auto_rest_swagger_bat_form_data_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFormData/autorestswaggerbatformdataservice/auto_rest_swagger_bat_form_data_service.py index 45ade7e198..cad009f211 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFormData/autorestswaggerbatformdataservice/auto_rest_swagger_bat_form_data_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyFormData/autorestswaggerbatformdataservice/auto_rest_swagger_bat_form_data_service.py @@ -22,16 +22,15 @@ class AutoRestSwaggerBATFormDataServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestSwaggerBATFormDataServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestSwaggerBATFormDataServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestswaggerbatformdataservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestSwaggerBATFormDataService(object): :vartype formdata: .operations.FormdataOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url, filepath) + self.config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/auto_rest_integer_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/auto_rest_integer_test_service.py index 37f074098b..67754676e0 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/auto_rest_integer_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/auto_rest_integer_test_service.py @@ -22,16 +22,15 @@ class AutoRestIntegerTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestIntegerTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestIntegerTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestintegertestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestIntegerTestService(object): :vartype int_model: .operations.IntModelOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestIntegerTestServiceConfiguration(base_url, filepath) + self.config = AutoRestIntegerTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyNumber/autorestnumbertestservice/auto_rest_number_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyNumber/autorestnumbertestservice/auto_rest_number_test_service.py index 568e5193e5..2da2711a59 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyNumber/autorestnumbertestservice/auto_rest_number_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyNumber/autorestnumbertestservice/auto_rest_number_test_service.py @@ -22,16 +22,15 @@ class AutoRestNumberTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'https://localhost' - super(AutoRestNumberTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestNumberTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestnumbertestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestNumberTestService(object): :vartype number: .operations.NumberOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestNumberTestServiceConfiguration(base_url, filepath) + self.config = AutoRestNumberTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyString/autorestswaggerbatservice/auto_rest_swagger_bat_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyString/autorestswaggerbatservice/auto_rest_swagger_bat_service.py index 4508283da3..47a3c3a802 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyString/autorestswaggerbatservice/auto_rest_swagger_bat_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/BodyString/autorestswaggerbatservice/auto_rest_swagger_bat_service.py @@ -23,16 +23,15 @@ class AutoRestSwaggerBATServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestSwaggerBATServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestSwaggerBATServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestswaggerbatservice/{}'.format(VERSION)) @@ -49,13 +48,12 @@ class AutoRestSwaggerBATService(object): :vartype enum: .operations.EnumOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestSwaggerBATServiceConfiguration(base_url, filepath) + self.config = AutoRestSwaggerBATServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py index a38fd10df5..265784067d 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py @@ -24,11 +24,10 @@ class AutoRestParameterizedHostTestClientConfiguration(Configuration): :param host: A string value that is used as a global part of the parameterized host :type host: str - :param str filepath: Existing config """ def __init__( - self, host, filepath=None): + self, host): if host is None: raise ValueError("Parameter 'host' must not be None.") @@ -36,7 +35,7 @@ def __init__( raise TypeError("Parameter 'host' must be str.") base_url = 'http://{accountName}{host}' - super(AutoRestParameterizedHostTestClientConfiguration, self).__init__(base_url, filepath) + super(AutoRestParameterizedHostTestClientConfiguration, self).__init__(base_url) self.add_user_agent('autorestparameterizedhosttestclient/{}'.format(VERSION)) @@ -55,13 +54,12 @@ class AutoRestParameterizedHostTestClient(object): :param host: A string value that is used as a global part of the parameterized host :type host: str - :param str filepath: Existing config """ def __init__( - self, host, filepath=None): + self, host): - self.config = AutoRestParameterizedHostTestClientConfiguration(host, filepath) + self.config = AutoRestParameterizedHostTestClientConfiguration(host) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/auto_rest_parameterized_custom_host_test_client.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/auto_rest_parameterized_custom_host_test_client.py index 610032a915..d8912a4a51 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/auto_rest_parameterized_custom_host_test_client.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/auto_rest_parameterized_custom_host_test_client.py @@ -26,11 +26,10 @@ class AutoRestParameterizedCustomHostTestClientConfiguration(Configuration): :param dns_suffix: A string value that is used as a global part of the parameterized host. Default value 'host'. :type dns_suffix: str - :param str filepath: Existing config """ def __init__( - self, subscription_id, dns_suffix, filepath=None): + self, subscription_id, dns_suffix): if subscription_id is None: raise ValueError("Parameter 'subscription_id' must not be None.") @@ -42,7 +41,7 @@ def __init__( raise TypeError("Parameter 'dns_suffix' must be str.") base_url = '{vault}{secret}{dnsSuffix}' - super(AutoRestParameterizedCustomHostTestClientConfiguration, self).__init__(base_url, filepath) + super(AutoRestParameterizedCustomHostTestClientConfiguration, self).__init__(base_url) self.add_user_agent('autorestparameterizedcustomhosttestclient/{}'.format(VERSION)) @@ -64,13 +63,12 @@ class AutoRestParameterizedCustomHostTestClient(object): :param dns_suffix: A string value that is used as a global part of the parameterized host. Default value 'host'. :type dns_suffix: str - :param str filepath: Existing config """ def __init__( - self, subscription_id, dns_suffix, filepath=None): + self, subscription_id, dns_suffix): - self.config = AutoRestParameterizedCustomHostTestClientConfiguration(subscription_id, dns_suffix, filepath) + self.config = AutoRestParameterizedCustomHostTestClientConfiguration(subscription_id, dns_suffix) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Header/autorestswaggerbatheaderservice/auto_rest_swagger_bat_header_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Header/autorestswaggerbatheaderservice/auto_rest_swagger_bat_header_service.py index 34514ad2b9..f7dbdace80 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Header/autorestswaggerbatheaderservice/auto_rest_swagger_bat_header_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Header/autorestswaggerbatheaderservice/auto_rest_swagger_bat_header_service.py @@ -22,16 +22,15 @@ class AutoRestSwaggerBATHeaderServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestSwaggerBATHeaderServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestSwaggerBATHeaderServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestswaggerbatheaderservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestSwaggerBATHeaderService(object): :vartype header: .operations.HeaderOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestSwaggerBATHeaderServiceConfiguration(base_url, filepath) + self.config = AutoRestSwaggerBATHeaderServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Http/autoresthttpinfrastructuretestservice/auto_rest_http_infrastructure_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Http/autoresthttpinfrastructuretestservice/auto_rest_http_infrastructure_test_service.py index 1f3fa68d1f..0b47979550 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Http/autoresthttpinfrastructuretestservice/auto_rest_http_infrastructure_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Http/autoresthttpinfrastructuretestservice/auto_rest_http_infrastructure_test_service.py @@ -29,16 +29,15 @@ class AutoRestHttpInfrastructureTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestHttpInfrastructureTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestHttpInfrastructureTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autoresthttpinfrastructuretestservice/{}'.format(VERSION)) @@ -65,13 +64,12 @@ class AutoRestHttpInfrastructureTestService(object): :vartype multiple_responses: .operations.MultipleResponsesOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestHttpInfrastructureTestServiceConfiguration(base_url, filepath) + self.config = AutoRestHttpInfrastructureTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py index d55efbd3d1..4d1b3bc288 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py @@ -22,16 +22,15 @@ class AutoRestResourceFlatteningTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestResourceFlatteningTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestResourceFlatteningTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestresourceflatteningtestservice/{}'.format(VERSION)) @@ -43,13 +42,12 @@ class AutoRestResourceFlatteningTestService(object): :vartype config: AutoRestResourceFlatteningTestServiceConfiguration :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestResourceFlatteningTestServiceConfiguration(base_url, filepath) + self.config = AutoRestResourceFlatteningTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ParameterFlattening/autorestparameterflattening/auto_rest_parameter_flattening.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ParameterFlattening/autorestparameterflattening/auto_rest_parameter_flattening.py index 510e5966ef..1e90f227db 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ParameterFlattening/autorestparameterflattening/auto_rest_parameter_flattening.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/ParameterFlattening/autorestparameterflattening/auto_rest_parameter_flattening.py @@ -23,16 +23,15 @@ class AutoRestParameterFlatteningConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestParameterFlatteningConfiguration, self).__init__(base_url, filepath) + super(AutoRestParameterFlatteningConfiguration, self).__init__(base_url) self.add_user_agent('autorestparameterflattening/{}'.format(VERSION)) @@ -47,13 +46,12 @@ class AutoRestParameterFlattening(object): :vartype availability_sets: .operations.AvailabilitySetsOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestParameterFlatteningConfiguration(base_url, filepath) + self.config = AutoRestParameterFlatteningConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Report/autorestreportservice/auto_rest_report_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Report/autorestreportservice/auto_rest_report_service.py index 5db50baaf0..7879edfc75 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Report/autorestreportservice/auto_rest_report_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Report/autorestreportservice/auto_rest_report_service.py @@ -22,16 +22,15 @@ class AutoRestReportServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestReportServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestReportServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestreportservice/{}'.format(VERSION)) @@ -43,13 +42,12 @@ class AutoRestReportService(object): :vartype config: AutoRestReportServiceConfiguration :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestReportServiceConfiguration(base_url, filepath) + self.config = AutoRestReportServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py index aaead814da..d2b13533fd 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py @@ -29,11 +29,10 @@ class AutoRestRequiredOptionalTestServiceConfiguration(Configuration): :param optional_global_query: number of items to skip :type optional_global_query: int :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, required_global_path, required_global_query, optional_global_query=None, base_url=None, filepath=None): + self, required_global_path, required_global_query, optional_global_query=None, base_url=None): if required_global_path is None: raise ValueError("Parameter 'required_global_path' must not be None.") @@ -46,7 +45,7 @@ def __init__( if not base_url: base_url = 'http://localhost' - super(AutoRestRequiredOptionalTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestRequiredOptionalTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autorestrequiredoptionaltestservice/{}'.format(VERSION)) @@ -73,13 +72,12 @@ class AutoRestRequiredOptionalTestService(object): :param optional_global_query: number of items to skip :type optional_global_query: int :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, required_global_path, required_global_query, optional_global_query=None, base_url=None, filepath=None): + self, required_global_path, required_global_query, optional_global_query=None, base_url=None): - self.config = AutoRestRequiredOptionalTestServiceConfiguration(required_global_path, required_global_query, optional_global_query, base_url, filepath) + self.config = AutoRestRequiredOptionalTestServiceConfiguration(required_global_path, required_global_query, optional_global_query, base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py index 9e28b43bcf..c3cf0fe928 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py @@ -29,11 +29,10 @@ class AutoRestUrlTestServiceConfiguration(Configuration): :param global_string_query: should contain value null :type global_string_query: str :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, global_string_path, global_string_query=None, base_url=None, filepath=None): + self, global_string_path, global_string_query=None, base_url=None): if global_string_path is None: raise ValueError("Parameter 'global_string_path' must not be None.") @@ -44,7 +43,7 @@ def __init__( if not base_url: base_url = 'http://localhost' - super(AutoRestUrlTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestUrlTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autoresturltestservice/{}'.format(VERSION)) @@ -71,13 +70,12 @@ class AutoRestUrlTestService(object): :param global_string_query: should contain value null :type global_string_query: str :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, global_string_path, global_string_query=None, base_url=None, filepath=None): + self, global_string_path, global_string_query=None, base_url=None): - self.config = AutoRestUrlTestServiceConfiguration(global_string_path, global_string_query, base_url, filepath) + self.config = AutoRestUrlTestServiceConfiguration(global_string_path, global_string_query, base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/UrlMultiCollectionFormat/autoresturlmutlicollectionformattestservice/auto_rest_url_mutli_collection_format_test_service.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/UrlMultiCollectionFormat/autoresturlmutlicollectionformattestservice/auto_rest_url_mutli_collection_format_test_service.py index 4fd6151511..e5e705110c 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/UrlMultiCollectionFormat/autoresturlmutlicollectionformattestservice/auto_rest_url_mutli_collection_format_test_service.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/UrlMultiCollectionFormat/autoresturlmutlicollectionformattestservice/auto_rest_url_mutli_collection_format_test_service.py @@ -22,16 +22,15 @@ class AutoRestUrlMutliCollectionFormatTestServiceConfiguration(Configuration): attributes. :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): if not base_url: base_url = 'http://localhost' - super(AutoRestUrlMutliCollectionFormatTestServiceConfiguration, self).__init__(base_url, filepath) + super(AutoRestUrlMutliCollectionFormatTestServiceConfiguration, self).__init__(base_url) self.add_user_agent('autoresturlmutlicollectionformattestservice/{}'.format(VERSION)) @@ -46,13 +45,12 @@ class AutoRestUrlMutliCollectionFormatTestService(object): :vartype queries: .operations.QueriesOperations :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, base_url=None, filepath=None): + self, base_url=None): - self.config = AutoRestUrlMutliCollectionFormatTestServiceConfiguration(base_url, filepath) + self.config = AutoRestUrlMutliCollectionFormatTestServiceConfiguration(base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py index 8de0581753..04fc1b9640 100644 --- a/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py +++ b/src/generator/AutoRest.Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py @@ -27,11 +27,10 @@ class AutoRestValidationTestConfiguration(Configuration): :param api_version: Required string following pattern \\d{2}-\\d{2}-\\d{4} :type api_version: str :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, subscription_id, api_version, base_url=None, filepath=None): + self, subscription_id, api_version, base_url=None): if subscription_id is None: raise ValueError("Parameter 'subscription_id' must not be None.") @@ -44,7 +43,7 @@ def __init__( if not base_url: base_url = 'http://localhost' - super(AutoRestValidationTestConfiguration, self).__init__(base_url, filepath) + super(AutoRestValidationTestConfiguration, self).__init__(base_url) self.add_user_agent('autorestvalidationtest/{}'.format(VERSION)) @@ -63,13 +62,12 @@ class AutoRestValidationTest(object): :param api_version: Required string following pattern \\d{2}-\\d{2}-\\d{4} :type api_version: str :param str base_url: Service URL - :param str filepath: Existing config """ def __init__( - self, subscription_id, api_version, base_url=None, filepath=None): + self, subscription_id, api_version, base_url=None): - self.config = AutoRestValidationTestConfiguration(subscription_id, api_version, base_url, filepath) + self.config = AutoRestValidationTestConfiguration(subscription_id, api_version, base_url) self._client = ServiceClient(None, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/src/generator/AutoRest.Python/Model/CodeModelPy.cs b/src/generator/AutoRest.Python/Model/CodeModelPy.cs index 78f7b917cf..7057e40e80 100644 --- a/src/generator/AutoRest.Python/Model/CodeModelPy.cs +++ b/src/generator/AutoRest.Python/Model/CodeModelPy.cs @@ -87,7 +87,7 @@ public virtual string RequiredConstructorParameters var param = string.Join(", ", requireParams); if (!string.IsNullOrEmpty(param)) { - param += ", "; + param = ", " + param; } return param; } @@ -104,9 +104,9 @@ public virtual string ConfigConstructorParameters configParams.Add(property.Name); } var param = string.Join(", ", configParams); - if (!param.IsNullOrEmpty()) + if (!IsCustomBaseUri) { - param += ", "; + param += (param.IsNullOrEmpty() ? "" : ", ") + "base_url"; } return param; } diff --git a/src/generator/AutoRest.Python/Templates/ServiceClientTemplate.cshtml b/src/generator/AutoRest.Python/Templates/ServiceClientTemplate.cshtml index b1d8b5ad51..e2494a0a37 100644 --- a/src/generator/AutoRest.Python/Templates/ServiceClientTemplate.cshtml +++ b/src/generator/AutoRest.Python/Templates/ServiceClientTemplate.cshtml @@ -56,11 +56,10 @@ class @(Model.Name)Configuration(Configuration): { @: :param str base_url: Service URL } - :param str filepath: Existing config """ @EmptyLine def __init__( - self, @(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : "base_url=None, ")filepath=None): + self@(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : ", base_url=None")): @EmptyLine @Model.ValidateRequiredParameters @@ -75,7 +74,7 @@ else } @EmptyLine - super(@(Model.Name)Configuration, self).__init__(base_url, filepath) + super(@(Model.Name)Configuration, self).__init__(base_url) @EmptyLine self.add_user_agent('@Model.UserAgent/{}'.format(VERSION)) @if (Model.Properties.Any() || Model.ConstantProperties.Any()) @@ -117,13 +116,12 @@ class @(Model.Name)(object): { @: :param str base_url: Service URL } - :param str filepath: Existing config """ @EmptyLine def __init__( - self, @(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : "base_url=None, ")filepath=None): + self@(Model.RequiredConstructorParameters)@(Model.IsCustomBaseUri ? "" : ", base_url=None")): @EmptyLine - self.config = @(Model.Name)Configuration(@(Model.ConfigConstructorParameters)@(Model.IsCustomBaseUri ? "" : "base_url, ")filepath) + self.config = @(Model.Name)Configuration(@(Model.ConfigConstructorParameters)) self._client = ServiceClient(@(Settings.AddCredentials? "self.config.credentials" : PythonConstants.None), self.config) @EmptyLine @if (Model.ModelTemplateModels.Any())