Merge branch 'master' of https://github.com/Azure/azure-sdk-for-python …

…into feature/text_analytics_v3.0

* 'master' of https://github.com/Azure/azure-sdk-for-python:
  Release azure mgmt containerregistry (#11460)
  Prepare core 1.6.0 on master (#11610)
  Add force parameter to SwaggerToSdk CLI (#11609)
  LRO continuation_token (#10801)
  Remove unecessary import (#11606)
  Fix Cleanup failing on 3.8.3 (#11607)
  remove DataSourceCredentials (#11605)
  Search synonym map (#11590)
  Fix copy tests (#11594)
  Make use_training_labels positional required (#11529)
  Search refactoring 2 (#11584)
  Search refactoring 1 (#11572)

sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Release History
 
+## 3.0.0rc13(2020-05-15)
+
+**Features**
+
+  - Model Replication has a new parameter region_endpoint_enabled
+  - Model ReplicationUpdateParameters has a new parameter region_endpoint_enabled
+
+**Breaking changes**
+
+  - Operation ReplicationsOperations.create has a new signature
+  - Operation ReplicationsOperations.update has a new signature
+  - Operation ReplicationsOperations.create has a new signature
+
 ## 3.0.0rc12(2020-05-06)
 
 **Features**

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models.py

@@ -3187,6 +3187,11 @@ class Replication(Resource):
      called.
     :vartype status:
      ~azure.mgmt.containerregistry.v2019_12_01_preview.models.Status
+    :param region_endpoint_enabled: Specifies whether the replication's
+     regional endpoint is enabled. Requests will not be routed to a replication
+     whose regional endpoint is disabled, however its data will continue to be
+     synced with other replications. Default value: True .
+    :type region_endpoint_enabled: bool
     """
 
     _validation = {
@@ -3206,28 +3211,37 @@ class Replication(Resource):
         'tags': {'key': 'tags', 'type': '{str}'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'status': {'key': 'properties.status', 'type': 'Status'},
+        'region_endpoint_enabled': {'key': 'properties.regionEndpointEnabled', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):
         super(Replication, self).__init__(**kwargs)
         self.provisioning_state = None
         self.status = None
+        self.region_endpoint_enabled = kwargs.get('region_endpoint_enabled', True)
 
 
 class ReplicationUpdateParameters(Model):
     """The parameters for updating a replication.
 
     :param tags: The tags for the replication.
     :type tags: dict[str, str]
+    :param region_endpoint_enabled: Specifies whether the replication's
+     regional endpoint is enabled. Requests will not be routed to a replication
+     whose regional endpoint is disabled, however its data will continue to be
+     synced with other replications.
+    :type region_endpoint_enabled: bool
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
+        'region_endpoint_enabled': {'key': 'properties.regionEndpointEnabled', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):
         super(ReplicationUpdateParameters, self).__init__(**kwargs)
         self.tags = kwargs.get('tags', None)
+        self.region_endpoint_enabled = kwargs.get('region_endpoint_enabled', None)
 
 
 class Request(Model):

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models_py3.py

@@ -3187,6 +3187,11 @@ class Replication(Resource):
      called.
     :vartype status:
      ~azure.mgmt.containerregistry.v2019_12_01_preview.models.Status
+    :param region_endpoint_enabled: Specifies whether the replication's
+     regional endpoint is enabled. Requests will not be routed to a replication
+     whose regional endpoint is disabled, however its data will continue to be
+     synced with other replications. Default value: True .
+    :type region_endpoint_enabled: bool
     """
 
     _validation = {
@@ -3206,28 +3211,37 @@ class Replication(Resource):
         'tags': {'key': 'tags', 'type': '{str}'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'status': {'key': 'properties.status', 'type': 'Status'},
+        'region_endpoint_enabled': {'key': 'properties.regionEndpointEnabled', 'type': 'bool'},
     }
 
-    def __init__(self, *, location: str, tags=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, region_endpoint_enabled: bool=True, **kwargs) -> None:
         super(Replication, self).__init__(location=location, tags=tags, **kwargs)
         self.provisioning_state = None
         self.status = None
+        self.region_endpoint_enabled = region_endpoint_enabled
 
 
 class ReplicationUpdateParameters(Model):
     """The parameters for updating a replication.
 
     :param tags: The tags for the replication.
     :type tags: dict[str, str]
+    :param region_endpoint_enabled: Specifies whether the replication's
+     regional endpoint is enabled. Requests will not be routed to a replication
+     whose regional endpoint is disabled, however its data will continue to be
+     synced with other replications.
+    :type region_endpoint_enabled: bool
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
+        'region_endpoint_enabled': {'key': 'properties.regionEndpointEnabled', 'type': 'bool'},
     }
 
-    def __init__(self, *, tags=None, **kwargs) -> None:
+    def __init__(self, *, tags=None, region_endpoint_enabled: bool=None, **kwargs) -> None:
         super(ReplicationUpdateParameters, self).__init__(**kwargs)
         self.tags = tags
+        self.region_endpoint_enabled = region_endpoint_enabled
 
 
 class Request(Model):

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/operations/_replications_operations.py

@@ -109,9 +109,7 @@ def get(
 
 
     def _create_initial(
-            self, resource_group_name, registry_name, replication_name, location, tags=None, custom_headers=None, raw=False, **operation_config):
-        replication = models.Replication(location=location, tags=tags)
-
+            self, resource_group_name, registry_name, replication_name, replication, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.create.metadata['url']
         path_format_arguments = {
@@ -163,7 +161,7 @@ def _create_initial(
         return deserialized
 
     def create(
-            self, resource_group_name, registry_name, replication_name, location, tags=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, registry_name, replication_name, replication, custom_headers=None, raw=False, polling=True, **operation_config):
         """Creates a replication for a container registry with the specified
         parameters.
 
@@ -174,11 +172,9 @@ def create(
         :type registry_name: str
         :param replication_name: The name of the replication.
         :type replication_name: str
-        :param location: The location of the resource. This cannot be changed
-         after the resource is created.
-        :type location: str
-        :param tags: The tags of the resource.
-        :type tags: dict[str, str]
+        :param replication: The parameters for creating a replication.
+        :type replication:
+         ~azure.mgmt.containerregistry.v2019_12_01_preview.models.Replication
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
          direct response alongside the deserialized response
@@ -196,8 +192,7 @@ def create(
             resource_group_name=resource_group_name,
             registry_name=registry_name,
             replication_name=replication_name,
-            location=location,
-            tags=tags,
+            replication=replication,
             custom_headers=custom_headers,
             raw=True,
             **operation_config
@@ -307,8 +302,8 @@ def get_long_running_output(response):
 
 
     def _update_initial(
-            self, resource_group_name, registry_name, replication_name, tags=None, custom_headers=None, raw=False, **operation_config):
-        replication_update_parameters = models.ReplicationUpdateParameters(tags=tags)
+            self, resource_group_name, registry_name, replication_name, tags=None, region_endpoint_enabled=None, custom_headers=None, raw=False, **operation_config):
+        replication_update_parameters = models.ReplicationUpdateParameters(tags=tags, region_endpoint_enabled=region_endpoint_enabled)
 
         # Construct URL
         url = self.update.metadata['url']
@@ -361,7 +356,7 @@ def _update_initial(
         return deserialized
 
     def update(
-            self, resource_group_name, registry_name, replication_name, tags=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, registry_name, replication_name, tags=None, region_endpoint_enabled=None, custom_headers=None, raw=False, polling=True, **operation_config):
         """Updates a replication for a container registry with the specified
         parameters.
 
@@ -374,6 +369,11 @@ def update(
         :type replication_name: str
         :param tags: The tags for the replication.
         :type tags: dict[str, str]
+        :param region_endpoint_enabled: Specifies whether the replication's
+         regional endpoint is enabled. Requests will not be routed to a
+         replication whose regional endpoint is disabled, however its data will
+         continue to be synced with other replications.
+        :type region_endpoint_enabled: bool
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
          direct response alongside the deserialized response
@@ -392,6 +392,7 @@ def update(
             registry_name=registry_name,
             replication_name=replication_name,
             tags=tags,
+            region_endpoint_enabled=region_endpoint_enabled,
             custom_headers=custom_headers,
             raw=True,
             **operation_config

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/version.py

@@ -9,4 +9,4 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "3.0.0rc12"
+VERSION = "3.0.0rc13"