Generated from 861e08e366cff1f1318a69d39841f25bee90c963 (#5715)

Merge branch 'master' into dev-healthcareapis-Microsoft.HealthcareApis-2018-08-20-preview

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/healthcare_apis_management_client.py

@@ -16,7 +16,6 @@
 from .operations.services_operations import ServicesOperations
 from .operations.operations import Operations
 from .operations.operation_results_operations import OperationResultsOperations
-from .operations.move_resources_status_operations import MoveResourcesStatusOperations
 from . import models
 
 
@@ -64,8 +63,6 @@ class HealthcareApisManagementClient(SDKClient):
     :vartype operations: azure.mgmt.healthcareapis.operations.Operations
     :ivar operation_results: OperationResults operations
     :vartype operation_results: azure.mgmt.healthcareapis.operations.OperationResultsOperations
-    :ivar move_resources_status: MoveResourcesStatus operations
-    :vartype move_resources_status: azure.mgmt.healthcareapis.operations.MoveResourcesStatusOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -92,5 +89,3 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.operation_results = OperationResultsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.move_resources_status = MoveResourcesStatusOperations(
-            self._client, self.config, self._serialize, self._deserialize)

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/__init__.py

@@ -12,6 +12,8 @@
 try:
     from .service_access_policy_entry_py3 import ServiceAccessPolicyEntry
     from .service_cosmos_db_configuration_info_py3 import ServiceCosmosDbConfigurationInfo
+    from .service_authentication_configuration_info_py3 import ServiceAuthenticationConfigurationInfo
+    from .service_cors_configuration_info_py3 import ServiceCorsConfigurationInfo
     from .services_properties_py3 import ServicesProperties
     from .services_description_py3 import ServicesDescription
     from .services_patch_description_py3 import ServicesPatchDescription
@@ -22,11 +24,12 @@
     from .operation_py3 import Operation
     from .check_name_availability_parameters_py3 import CheckNameAvailabilityParameters
     from .services_name_availability_info_py3 import ServicesNameAvailabilityInfo
-    from .move_resources_parameters_py3 import MoveResourcesParameters
     from .operation_results_description_py3 import OperationResultsDescription
 except (SyntaxError, ImportError):
     from .service_access_policy_entry import ServiceAccessPolicyEntry
     from .service_cosmos_db_configuration_info import ServiceCosmosDbConfigurationInfo
+    from .service_authentication_configuration_info import ServiceAuthenticationConfigurationInfo
+    from .service_cors_configuration_info import ServiceCorsConfigurationInfo
     from .services_properties import ServicesProperties
     from .services_description import ServicesDescription
     from .services_patch_description import ServicesPatchDescription
@@ -37,7 +40,6 @@
     from .operation import Operation
     from .check_name_availability_parameters import CheckNameAvailabilityParameters
     from .services_name_availability_info import ServicesNameAvailabilityInfo
-    from .move_resources_parameters import MoveResourcesParameters
     from .operation_results_description import OperationResultsDescription
 from .services_description_paged import ServicesDescriptionPaged
 from .operation_paged import OperationPaged
@@ -50,6 +52,8 @@
 __all__ = [
     'ServiceAccessPolicyEntry',
     'ServiceCosmosDbConfigurationInfo',
+    'ServiceAuthenticationConfigurationInfo',
+    'ServiceCorsConfigurationInfo',
     'ServicesProperties',
     'ServicesDescription',
     'ServicesPatchDescription',
@@ -60,7 +64,6 @@
     'Operation',
     'CheckNameAvailabilityParameters',
     'ServicesNameAvailabilityInfo',
-    'MoveResourcesParameters',
     'OperationResultsDescription',
     'ServicesDescriptionPaged',
     'OperationPaged',

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/service_authentication_configuration_info.py

@@ -0,0 +1,36 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ServiceAuthenticationConfigurationInfo(Model):
+    """Authentication configuration information.
+
+    :param authority: The authority url for the service
+    :type authority: str
+    :param audience: The audience url for the service
+    :type audience: str
+    :param smart_proxy_enabled: If the SMART on FHIR proxy is enabled
+    :type smart_proxy_enabled: bool
+    """
+
+    _attribute_map = {
+        'authority': {'key': 'authority', 'type': 'str'},
+        'audience': {'key': 'audience', 'type': 'str'},
+        'smart_proxy_enabled': {'key': 'smartProxyEnabled', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ServiceAuthenticationConfigurationInfo, self).__init__(**kwargs)
+        self.authority = kwargs.get('authority', None)
+        self.audience = kwargs.get('audience', None)
+        self.smart_proxy_enabled = kwargs.get('smart_proxy_enabled', None)

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/service_authentication_configuration_info_py3.py

@@ -0,0 +1,36 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ServiceAuthenticationConfigurationInfo(Model):
+    """Authentication configuration information.
+
+    :param authority: The authority url for the service
+    :type authority: str
+    :param audience: The audience url for the service
+    :type audience: str
+    :param smart_proxy_enabled: If the SMART on FHIR proxy is enabled
+    :type smart_proxy_enabled: bool
+    """
+
+    _attribute_map = {
+        'authority': {'key': 'authority', 'type': 'str'},
+        'audience': {'key': 'audience', 'type': 'str'},
+        'smart_proxy_enabled': {'key': 'smartProxyEnabled', 'type': 'bool'},
+    }
+
+    def __init__(self, *, authority: str=None, audience: str=None, smart_proxy_enabled: bool=None, **kwargs) -> None:
+        super(ServiceAuthenticationConfigurationInfo, self).__init__(**kwargs)
+        self.authority = authority
+        self.audience = audience
+        self.smart_proxy_enabled = smart_proxy_enabled

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/service_cors_configuration_info.py

@@ -0,0 +1,48 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ServiceCorsConfigurationInfo(Model):
+    """The settings for the CORS configuration of the service instance.
+
+    :param origins: The origins to be allowed via CORS.
+    :type origins: list[str]
+    :param headers: The headers to be allowed via CORS.
+    :type headers: list[str]
+    :param methods: The methods to be allowed via CORS.
+    :type methods: list[str]
+    :param max_age: The max age to be allowed via CORS.
+    :type max_age: int
+    :param allow_credentials: If credentials are allowed via CORS.
+    :type allow_credentials: bool
+    """
+
+    _validation = {
+        'max_age': {'maximum': 99999, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'origins': {'key': 'origins', 'type': '[str]'},
+        'headers': {'key': 'headers', 'type': '[str]'},
+        'methods': {'key': 'methods', 'type': '[str]'},
+        'max_age': {'key': 'maxAge', 'type': 'int'},
+        'allow_credentials': {'key': 'allowCredentials', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ServiceCorsConfigurationInfo, self).__init__(**kwargs)
+        self.origins = kwargs.get('origins', None)
+        self.headers = kwargs.get('headers', None)
+        self.methods = kwargs.get('methods', None)
+        self.max_age = kwargs.get('max_age', None)
+        self.allow_credentials = kwargs.get('allow_credentials', None)

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/service_cors_configuration_info_py3.py

@@ -0,0 +1,48 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ServiceCorsConfigurationInfo(Model):
+    """The settings for the CORS configuration of the service instance.
+
+    :param origins: The origins to be allowed via CORS.
+    :type origins: list[str]
+    :param headers: The headers to be allowed via CORS.
+    :type headers: list[str]
+    :param methods: The methods to be allowed via CORS.
+    :type methods: list[str]
+    :param max_age: The max age to be allowed via CORS.
+    :type max_age: int
+    :param allow_credentials: If credentials are allowed via CORS.
+    :type allow_credentials: bool
+    """
+
+    _validation = {
+        'max_age': {'maximum': 99999, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'origins': {'key': 'origins', 'type': '[str]'},
+        'headers': {'key': 'headers', 'type': '[str]'},
+        'methods': {'key': 'methods', 'type': '[str]'},
+        'max_age': {'key': 'maxAge', 'type': 'int'},
+        'allow_credentials': {'key': 'allowCredentials', 'type': 'bool'},
+    }
+
+    def __init__(self, *, origins=None, headers=None, methods=None, max_age: int=None, allow_credentials: bool=None, **kwargs) -> None:
+        super(ServiceCorsConfigurationInfo, self).__init__(**kwargs)
+        self.origins = origins
+        self.headers = headers
+        self.methods = methods
+        self.max_age = max_age
+        self.allow_credentials = allow_credentials

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/service_cosmos_db_configuration_info.py

@@ -20,6 +20,10 @@ class ServiceCosmosDbConfigurationInfo(Model):
     :type offer_throughput: int
     """
 
+    _validation = {
+        'offer_throughput': {'maximum': 10000, 'minimum': 400},
+    }
+
     _attribute_map = {
         'offer_throughput': {'key': 'offerThroughput', 'type': 'int'},
     }

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/service_cosmos_db_configuration_info_py3.py

@@ -20,6 +20,10 @@ class ServiceCosmosDbConfigurationInfo(Model):
     :type offer_throughput: int
     """
 
+    _validation = {
+        'offer_throughput': {'maximum': 10000, 'minimum': 400},
+    }
+
     _attribute_map = {
         'offer_throughput': {'key': 'offerThroughput', 'type': 'int'},
     }

sdk/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/models/services_properties.py

@@ -33,6 +33,14 @@ class ServicesProperties(Model):
      backing the service.
     :type cosmos_db_configuration:
      ~azure.mgmt.healthcareapis.models.ServiceCosmosDbConfigurationInfo
+    :param authentication_configuration: The authentication configuration for
+     the service instance.
+    :type authentication_configuration:
+     ~azure.mgmt.healthcareapis.models.ServiceAuthenticationConfigurationInfo
+    :param cors_configuration: The settings for the CORS configuration of the
+     service instance.
+    :type cors_configuration:
+     ~azure.mgmt.healthcareapis.models.ServiceCorsConfigurationInfo
     """
 
     _validation = {
@@ -44,10 +52,14 @@ class ServicesProperties(Model):
         'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
         'access_policies': {'key': 'accessPolicies', 'type': '[ServiceAccessPolicyEntry]'},
         'cosmos_db_configuration': {'key': 'cosmosDbConfiguration', 'type': 'ServiceCosmosDbConfigurationInfo'},
+        'authentication_configuration': {'key': 'authenticationConfiguration', 'type': 'ServiceAuthenticationConfigurationInfo'},
+        'cors_configuration': {'key': 'corsConfiguration', 'type': 'ServiceCorsConfigurationInfo'},
     }
 
     def __init__(self, **kwargs):
         super(ServicesProperties, self).__init__(**kwargs)
         self.provisioning_state = None
         self.access_policies = kwargs.get('access_policies', None)
         self.cosmos_db_configuration = kwargs.get('cosmos_db_configuration', None)
+        self.authentication_configuration = kwargs.get('authentication_configuration', None)
+        self.cors_configuration = kwargs.get('cors_configuration', None)