Automatic PR from RestAPI-PR690

azure-mgmt-resource/azure/mgmt/resource/resources/models/__init__.py

@@ -44,7 +44,7 @@
 from .deployment_operation_properties import DeploymentOperationProperties
 from .deployment_operation import DeploymentOperation
 from .resource_provider_operation_display_properties import ResourceProviderOperationDisplayProperties
-from .resource_model import ResourceModel
+from .resource import Resource
 from .sub_resource import SubResource
 from .resource_group_export_result import ResourceGroupExportResult
 from .deployment_extended_paged import DeploymentExtendedPaged
@@ -94,7 +94,7 @@
     'DeploymentOperationProperties',
     'DeploymentOperation',
     'ResourceProviderOperationDisplayProperties',
-    'ResourceModel',
+    'Resource',
     'SubResource',
     'ResourceGroupExportResult',
     'DeploymentExtendedPaged',

azure-mgmt-resource/azure/mgmt/resource/resources/models/alias_path_type.py

@@ -17,7 +17,7 @@ class AliasPathType(Model):
 
     :param path: The path of an alias.
     :type path: str
-    :param api_versions: The api versions.
+    :param api_versions: The API versions.
     :type api_versions: list of str
     """ 
 

azure-mgmt-resource/azure/mgmt/resource/resources/models/debug_setting.py

@@ -15,7 +15,14 @@
 class DebugSetting(Model):
     """DebugSetting.
 
-    :param detail_level: The debug detail level.
+    :param detail_level: Specifies the type of information to log for
+     debugging. The permitted values are none, requestContent,
+     responseContent, or both requestContent and responseContent separated by
+     a comma. The default is none. When setting this value, carefully
+     consider the type of information you are passing in during deployment.
+     By logging information about the request or response, you could
+     potentially expose sensitive data that is retrieved through the
+     deployment operations.
     :type detail_level: str
     """ 
 

azure-mgmt-resource/azure/mgmt/resource/resources/models/deployment_operation.py

@@ -18,9 +18,9 @@ class DeploymentOperation(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Full deployment operation id.
+    :ivar id: Full deployment operation ID.
     :vartype id: str
-    :ivar operation_id: Deployment operation id.
+    :ivar operation_id: Deployment operation ID.
     :vartype operation_id: str
     :param properties: Deployment properties.
     :type properties: :class:`DeploymentOperationProperties

azure-mgmt-resource/azure/mgmt/resource/resources/models/deployment_properties.py

@@ -15,22 +15,36 @@
 class DeploymentProperties(Model):
     """Deployment properties.
 
-    :param template: The template content. It can be a JObject or a well
-     formed JSON string. Use only one of Template or TemplateLink.
+    :param template: The template content. You use this element when you want
+     to pass the template syntax directly in the request rather than link to
+     an existing template. It can be a JObject or well-formed JSON string.
+     Use either the templateLink property or the template property, but not
+     both.
     :type template: object
-    :param template_link: The template URI. Use only one of Template or
-     TemplateLink.
+    :param template_link: The URI of the template. Use either the
+     templateLink property or the template property, but not both.
     :type template_link: :class:`TemplateLink
      <azure.mgmt.resource.resources.models.TemplateLink>`
-    :param parameters: Deployment parameters. It can be a JObject or a well
-     formed JSON string. Use only one of Parameters or ParametersLink.
+    :param parameters: Name and value pairs that define the deployment
+     parameters for the template. You use this element when you want to
+     provide the parameter values directly in the request rather than link to
+     an existing parameter file. Use either the parametersLink property or
+     the parameters property, but not both. It can be a JObject or a well
+     formed JSON string.
     :type parameters: object
-    :param parameters_link: The parameters URI. Use only one of Parameters or
-     ParametersLink.
+    :param parameters_link: The URI of parameters file. You use this element
+     to link to an existing parameters file. Use either the parametersLink
+     property or the parameters property, but not both.
     :type parameters_link: :class:`ParametersLink
      <azure.mgmt.resource.resources.models.ParametersLink>`
-    :param mode: The deployment mode. Possible values include: 'Incremental',
-     'Complete'
+    :param mode: The mode that is used to deploy resources. This value can be
+     either Incremental or Complete. In Incremental mode, resources are
+     deployed without deleting existing resources that are not included in
+     the template. In Complete mode, resources are deployed and existing
+     resources in the resource group that are not included in the template
+     are deleted. Be careful when using Complete mode as you may
+     unintentionally delete resources. Possible values include:
+     'Incremental', 'Complete'
     :type mode: str or :class:`DeploymentMode
      <azure.mgmt.resource.resources.models.DeploymentMode>`
     :param debug_setting: The debug setting of the deployment.

azure-mgmt-resource/azure/mgmt/resource/resources/models/deployment_properties_extended.py

@@ -47,8 +47,8 @@ class DeploymentPropertiesExtended(Model):
      of Parameters or ParametersLink.
     :type parameters_link: :class:`ParametersLink
      <azure.mgmt.resource.resources.models.ParametersLink>`
-    :param mode: The deployment mode. Possible values include: 'Incremental',
-     'Complete'
+    :param mode: The deployment mode. Possible values are Incremental and
+     Complete. Possible values include: 'Incremental', 'Complete'
     :type mode: str or :class:`DeploymentMode
      <azure.mgmt.resource.resources.models.DeploymentMode>`
     :param debug_setting: The debug setting of the deployment.

azure-mgmt-resource/azure/mgmt/resource/resources/models/export_template_request.py

@@ -15,9 +15,9 @@
 class ExportTemplateRequest(Model):
     """Export resource group template request parameters.
 
-    :param resources: The ids of the resources. The only supported string
-     currently is '*' (all resources). Future api updates will support
-     exporting specific resources.
+    :param resources: The IDs of the resources. The only supported string
+     currently is '*' (all resources). Future updates will support exporting
+     specific resources.
     :type resources: list of str
     :param options: The export template options. Supported values include
      'IncludeParameterDefaultValue', 'IncludeComments' or

azure-mgmt-resource/azure/mgmt/resource/resources/models/generic_resource.py

@@ -9,16 +9,16 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_model import ResourceModel
+from .resource import Resource
 
 
-class GenericResource(ResourceModel):
+class GenericResource(Resource):
     """Resource information.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Resource Id
+    :ivar id: Resource ID
     :vartype id: str
     :ivar name: Resource name
     :vartype name: str
@@ -34,9 +34,9 @@ class GenericResource(ResourceModel):
     :type properties: object
     :param kind: The kind of the resource.
     :type kind: str
-    :param managed_by: Id of the resource that manages this resource.
+    :param managed_by: ID of the resource that manages this resource.
     :type managed_by: str
-    :param sku: The sku of the resource.
+    :param sku: The SKU of the resource.
     :type sku: :class:`Sku <azure.mgmt.resource.resources.models.Sku>`
     :param identity: The identity of the resource.
     :type identity: :class:`Identity

azure-mgmt-resource/azure/mgmt/resource/resources/models/identity.py

@@ -18,9 +18,9 @@ class Identity(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar principal_id: The principal id of resource identity.
+    :ivar principal_id: The principal ID of resource identity.
     :vartype principal_id: str
-    :ivar tenant_id: The tenant id of resource.
+    :ivar tenant_id: The tenant ID of resource.
     :vartype tenant_id: str
     :param type: The identity type. Possible values include: 'SystemAssigned'
     :type type: str or :class:`ResourceIdentityType

azure-mgmt-resource/azure/mgmt/resource/resources/models/parameters_link.py

@@ -15,10 +15,10 @@
 class ParametersLink(Model):
     """Entity representing the reference to the deployment paramaters.
 
-    :param uri: URI referencing the template.
+    :param uri: The URI of the parameters file.
     :type uri: str
-    :param content_version: If included it must match the ContentVersion in
-     the template.
+    :param content_version: If included, must match the ContentVersion in the
+     template.
     :type content_version: str
     """ 
 

azure-mgmt-resource/azure/mgmt/resource/resources/models/provider.py

@@ -18,9 +18,9 @@ class Provider(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: The provider id.
+    :ivar id: The provider ID.
     :vartype id: str
-    :param namespace: The namespace of the provider.
+    :param namespace: The namespace of the resource provider.
     :type namespace: str
     :ivar registration_state: The registration state of the provider.
     :vartype registration_state: str

azure-mgmt-resource/azure/mgmt/resource/resources/models/provider_resource_type.py

@@ -18,12 +18,12 @@ class ProviderResourceType(Model):
     :param resource_type: The resource type.
     :type resource_type: str
     :param locations: The collection of locations where this resource type
-     can be created in.
+     can be created.
     :type locations: list of str
     :param aliases: The aliases that are supported by this resource type.
     :type aliases: list of :class:`AliasType
      <azure.mgmt.resource.resources.models.AliasType>`
-    :param api_versions: The api version.
+    :param api_versions: The API version.
     :type api_versions: list of str
     :param properties: The properties.
     :type properties: dict

azure-mgmt-resource/azure/mgmt/resource/resources/models/resource_model.py → azure-mgmt-resource/azure/mgmt/resource/resources/models/resource.py

@@ -12,13 +12,13 @@
 from msrest.serialization import Model
 
 
-class ResourceModel(Model):
-    """ResourceModel.
+class Resource(Model):
+    """Resource.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Resource Id
+    :ivar id: Resource ID
     :vartype id: str
     :ivar name: Resource name
     :vartype name: str

azure-mgmt-resource/azure/mgmt/resource/resources/models/resource_group.py

@@ -20,17 +20,17 @@ class ResourceGroup(Model):
 
     :ivar id: The ID of the resource group.
     :vartype id: str
-    :param name: The Name of the resource group.
+    :param name: The name of the resource group.
     :type name: str
     :param properties:
     :type properties: :class:`ResourceGroupProperties
      <azure.mgmt.resource.resources.models.ResourceGroupProperties>`
     :param location: The location of the resource group. It cannot be changed
-     after the resource group has been created. Has to be one of the
-     supported Azure Locations, such as West US, East US, West Europe, East
-     Asia, etc.
+     after the resource group has been created. It muct be one of the
+     supported Azure locations.
     :type location: str
-    :param managed_by: Id of the resource that manages this resource group.
+    :param managed_by: The ID of the resource that manages this resource
+     group.
     :type managed_by: str
     :param tags: The tags attached to the resource group.
     :type tags: dict

azure-mgmt-resource/azure/mgmt/resource/resources/models/resource_management_error_with_details.py

@@ -18,9 +18,9 @@ class ResourceManagementErrorWithDetails(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar code: The error code returned from the server.
+    :ivar code: The error code returned when exporting the template.
     :vartype code: str
-    :ivar message: The error message returned from the server.
+    :ivar message: The error message describing the export error.
     :vartype message: str
     :ivar target: The target of the error.
     :vartype target: str

azure-mgmt-resource/azure/mgmt/resource/resources/models/resources_move_info.py

@@ -15,7 +15,7 @@
 class ResourcesMoveInfo(Model):
     """Parameters of move resources.
 
-    :param resources: The ids of the resources.
+    :param resources: The IDs of the resources.
     :type resources: list of str
     :param target_resource_group: The target resource group.
     :type target_resource_group: str

azure-mgmt-resource/azure/mgmt/resource/resources/models/sku.py

@@ -13,19 +13,19 @@
 
 
 class Sku(Model):
-    """Sku for the resource.
+    """SKU for the resource.
 
-    :param name: The sku name.
+    :param name: The SKU name.
     :type name: str
-    :param tier: The sku tier.
+    :param tier: The SKU tier.
     :type tier: str
-    :param size: The sku size.
+    :param size: The SKU size.
     :type size: str
-    :param family: The sku family.
+    :param family: The SKU family.
     :type family: str
-    :param model: The sku model.
+    :param model: The SKU model.
     :type model: str
-    :param capacity: The sku capacity.
+    :param capacity: The SKU capacity.
     :type capacity: int
     """ 
 

azure-mgmt-resource/azure/mgmt/resource/resources/models/sub_resource.py

@@ -15,7 +15,7 @@
 class SubResource(Model):
     """SubResource.
 
-    :param id: Resource Id
+    :param id: Resource ID
     :type id: str
     """ 
 

azure-mgmt-resource/azure/mgmt/resource/resources/models/tag_details.py

@@ -19,7 +19,9 @@ class TagDetails(Model):
     :type id: str
     :param tag_name: The tag name.
     :type tag_name: str
-    :param count: The tag count.
+    :param count: The total number of resources that use the resource tag.
+     When a tag is initially created and has no associated resources, the
+     value is 0.
     :type count: :class:`TagCount
      <azure.mgmt.resource.resources.models.TagCount>`
     :param values: The list of tag values.

azure-mgmt-resource/azure/mgmt/resource/resources/models/template_link.py

@@ -15,10 +15,10 @@
 class TemplateLink(Model):
     """Entity representing the reference to the template.
 
-    :param uri: URI referencing the template.
+    :param uri: The URI of the template to deploy.
     :type uri: str
-    :param content_version: If included it must match the ContentVersion in
-     the template.
+    :param content_version: If included, must match the ContentVersion in the
+     template.
     :type content_version: str
     """ 
 

azure-mgmt-resource/azure/mgmt/resource/resources/operations/__init__.py

@@ -14,13 +14,13 @@
 from .resource_groups_operations import ResourceGroupsOperations
 from .resources_operations import ResourcesOperations
 from .tags_operations import TagsOperations
-from .deployment_operations_operations import DeploymentOperationsOperations
+from .deployment_operations import DeploymentOperations
 
 __all__ = [
     'DeploymentsOperations',
     'ProvidersOperations',
     'ResourceGroupsOperations',
     'ResourcesOperations',
     'TagsOperations',
-    'DeploymentOperationsOperations',
+    'DeploymentOperations',
 ]

azure-mgmt-resource/azure/mgmt/resource/resources/operations/deployment_operations_operations.py → azure-mgmt-resource/azure/mgmt/resource/resources/operations/deployment_operations.py

@@ -16,8 +16,8 @@
 from .. import models
 
 
-class DeploymentOperationsOperations(object):
-    """DeploymentOperationsOperations operations.
+class DeploymentOperations(object):
+    """DeploymentOperations operations.
 
     :param client: Client for service requests.
     :param config: Configuration of service client.
@@ -35,14 +35,14 @@ def __init__(self, client, config, serializer, deserializer):
 
     def get(
             self, resource_group_name, deployment_name, operation_id, custom_headers=None, raw=False, **operation_config):
-        """Get a list of deployments operations.
+        """Gets a deployments operation.
 
         :param resource_group_name: The name of the resource group. The name
          is case insensitive.
         :type resource_group_name: str
         :param deployment_name: The name of the deployment.
         :type deployment_name: str
-        :param operation_id: Operation Id.
+        :param operation_id: The ID of the operation to get.
         :type operation_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -101,14 +101,15 @@ def get(
 
     def list(
             self, resource_group_name, deployment_name, top=None, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of deployments operations.
+        """Gets all deployments operations for a deployment.
 
         :param resource_group_name: The name of the resource group. The name
          is case insensitive.
         :type resource_group_name: str
-        :param deployment_name: The name of the deployment.
+        :param deployment_name: The name of the deployment with the operation
+         to get.
         :type deployment_name: str
-        :param top: Query parameters.
+        :param top: The number of results to return.
         :type top: int
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the