diff --git a/azure-mgmt-deploymentmanager/MANIFEST.in b/azure-mgmt-deploymentmanager/MANIFEST.in index 9ecaeb15de50..bb37a2723dae 100644 --- a/azure-mgmt-deploymentmanager/MANIFEST.in +++ b/azure-mgmt-deploymentmanager/MANIFEST.in @@ -1,2 +1 @@ include *.rst -include azure_bdist_wheel.py \ No newline at end of file diff --git a/azure-mgmt-deploymentmanager/azure/__init__.py b/azure-mgmt-deploymentmanager/azure/__init__.py index de40ea7ca058..0260537a02bb 100644 --- a/azure-mgmt-deploymentmanager/azure/__init__.py +++ b/azure-mgmt-deploymentmanager/azure/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/__init__.py b/azure-mgmt-deploymentmanager/azure/mgmt/__init__.py index de40ea7ca058..0260537a02bb 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/__init__.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source.py index 537b7bf17d99..0a6cea848766 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source.py @@ -13,7 +13,7 @@ class ArtifactSource(TrackedResource): - """The resource that define the source location where the artifacts are + """The resource that defines the source location where the artifacts are located. Variables are only populated by the server, and will be ignored when @@ -35,8 +35,13 @@ class ArtifactSource(TrackedResource): :type location: str :param source_type: Required. The type of artifact source used. :type source_type: str - :param artifact_root: The root folder under which all artifacts for all - environments are expected to be organized. + :param artifact_root: The path from the location that the 'authentication' + property [say, a SAS URI to the blob container] refers to, to the location + of the artifacts. This can be used to differentiate different versions of + the artifacts. Or, different types of artifacts like binaries or + templates. The location referenced by the authentication property + concatenated with this optional artifactRoot path forms the artifact + source location where the artifacts are expected to be found. :type artifact_root: str :param authentication: Required. The authentication method to use to access the artifact source. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model.py index b28d23d8232c..534026c6a720 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model.py @@ -20,8 +20,13 @@ class ArtifactSourcePropertiesModel(Model): :param source_type: Required. The type of artifact source used. :type source_type: str - :param artifact_root: The root folder under which all artifacts for all - environments are expected to be organized. + :param artifact_root: The path from the location that the 'authentication' + property [say, a SAS URI to the blob container] refers to, to the location + of the artifacts. This can be used to differentiate different versions of + the artifacts. Or, different types of artifacts like binaries or + templates. The location referenced by the authentication property + concatenated with this optional artifactRoot path forms the artifact + source location where the artifacts are expected to be found. :type artifact_root: str :param authentication: Required. The authentication method to use to access the artifact source. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model_py3.py index 0412dc6c4219..f46a7a9486da 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_properties_model_py3.py @@ -20,8 +20,13 @@ class ArtifactSourcePropertiesModel(Model): :param source_type: Required. The type of artifact source used. :type source_type: str - :param artifact_root: The root folder under which all artifacts for all - environments are expected to be organized. + :param artifact_root: The path from the location that the 'authentication' + property [say, a SAS URI to the blob container] refers to, to the location + of the artifacts. This can be used to differentiate different versions of + the artifacts. Or, different types of artifacts like binaries or + templates. The location referenced by the authentication property + concatenated with this optional artifactRoot path forms the artifact + source location where the artifacts are expected to be found. :type artifact_root: str :param authentication: Required. The authentication method to use to access the artifact source. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_py3.py index 20e9ba5c4406..42d7816f6687 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/artifact_source_py3.py @@ -13,7 +13,7 @@ class ArtifactSource(TrackedResource): - """The resource that define the source location where the artifacts are + """The resource that defines the source location where the artifacts are located. Variables are only populated by the server, and will be ignored when @@ -35,8 +35,13 @@ class ArtifactSource(TrackedResource): :type location: str :param source_type: Required. The type of artifact source used. :type source_type: str - :param artifact_root: The root folder under which all artifacts for all - environments are expected to be organized. + :param artifact_root: The path from the location that the 'authentication' + property [say, a SAS URI to the blob container] refers to, to the location + of the artifacts. This can be used to differentiate different versions of + the artifacts. Or, different types of artifacts like binaries or + templates. The location referenced by the authentication property + concatenated with this optional artifactRoot path forms the artifact + source location where the artifacts are expected to be found. :type artifact_root: str :param authentication: Required. The authentication method to use to access the artifact source. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step.py index fb5acc52bbe0..6fed8a1c9fe1 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step.py @@ -17,7 +17,7 @@ class PrePostStep(Model): All required parameters must be populated in order to send to Azure. - :param step_id: Required. The reference to the ARM resource Id of a step. + :param step_id: Required. The resource Id of the step to be run. :type step_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step_py3.py index 769059ecbb74..33bb9c3bf23a 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/pre_post_step_py3.py @@ -17,7 +17,7 @@ class PrePostStep(Model): All required parameters must be populated in order to send to Azure. - :param step_id: Required. The reference to the ARM resource Id of a step. + :param step_id: Required. The resource Id of the step to be run. :type step_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout.py index fc469b946524..e9f691564816 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout.py @@ -13,7 +13,7 @@ class Rollout(TrackedResource): - """Defines the rollout resource. + """Defines the rollout. Variables are only populated by the server, and will be ignored when sending a request. @@ -36,13 +36,14 @@ class Rollout(TrackedResource): :type identity: ~azure.mgmt.deploymentmanager.models.Identity :param build_version: Required. The version of the build being deployed. :type build_version: str - :param artifact_source_id: The reference to the ARM resource Id where the - payload is located. + :param artifact_source_id: The reference to the artifact source resource + Id where the payload is located. :type artifact_source_id: str - :param target_service_topology_id: Required. The reference to the resource - Id of the service topology from which services are chosen to be deployed. + :param target_service_topology_id: Required. The resource Id of the + service topology from which service units are being referenced in step + groups to be deployed. :type target_service_topology_id: str - :param step_groups: Required. The list of steps that define the + :param step_groups: Required. The list of step groups that define the orchestration. :type step_groups: list[~azure.mgmt.deploymentmanager.models.Step] :ivar status: The current status of the rollout. @@ -53,8 +54,7 @@ class Rollout(TrackedResource): :ivar operation_info: Operational information of the rollout. :vartype operation_info: ~azure.mgmt.deploymentmanager.models.RolloutOperationInfo - :ivar services: Set of detailed step result information on target resource - groups. + :ivar services: The detailed information on the services being deployed. :vartype services: list[~azure.mgmt.deploymentmanager.models.Service] """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info.py index 2da2680f9833..91d2d3b538c3 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info.py @@ -18,11 +18,13 @@ class RolloutOperationInfo(Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar retry_attempt: The ordinal count of retry attempt. 0 if no retries - of the rollout have been performed. + :ivar retry_attempt: The ordinal count of the number of retry attempts on + a rollout. 0 if no retries of the rollout have been performed. If the + rollout is updated with a PUT, this count is reset to 0. :vartype retry_attempt: int - :ivar skip_succeeded_on_retry: True if skipping all successful steps in - the given retry attempt was chosen. False otherwise. + :ivar skip_succeeded_on_retry: True, if all steps that succeeded on the + previous run/attempt were chosen to be skipped in this retry attempt. + False, otherwise. :vartype skip_succeeded_on_retry: bool :ivar start_time: The start time of the rollout in UTC. :vartype start_time: datetime diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info_py3.py index acbaeec01780..9dd400e0d95a 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_operation_info_py3.py @@ -18,11 +18,13 @@ class RolloutOperationInfo(Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar retry_attempt: The ordinal count of retry attempt. 0 if no retries - of the rollout have been performed. + :ivar retry_attempt: The ordinal count of the number of retry attempts on + a rollout. 0 if no retries of the rollout have been performed. If the + rollout is updated with a PUT, this count is reset to 0. :vartype retry_attempt: int - :ivar skip_succeeded_on_retry: True if skipping all successful steps in - the given retry attempt was chosen. False otherwise. + :ivar skip_succeeded_on_retry: True, if all steps that succeeded on the + previous run/attempt were chosen to be skipped in this retry attempt. + False, otherwise. :vartype skip_succeeded_on_retry: bool :ivar start_time: The start time of the rollout in UTC. :vartype start_time: datetime diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model.py index c0466a72c615..50dacf5fc2ca 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model.py @@ -26,8 +26,7 @@ class RolloutPropertiesModel(Model): :ivar operation_info: Operational information of the rollout. :vartype operation_info: ~azure.mgmt.deploymentmanager.models.RolloutOperationInfo - :ivar services: Set of detailed step result information on target resource - groups. + :ivar services: The detailed information on the services being deployed. :vartype services: list[~azure.mgmt.deploymentmanager.models.Service] """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model_py3.py index 29d32100944b..3ba0d1a7fa72 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_properties_model_py3.py @@ -26,8 +26,7 @@ class RolloutPropertiesModel(Model): :ivar operation_info: Operational information of the rollout. :vartype operation_info: ~azure.mgmt.deploymentmanager.models.RolloutOperationInfo - :ivar services: Set of detailed step result information on target resource - groups. + :ivar services: The detailed information on the services being deployed. :vartype services: list[~azure.mgmt.deploymentmanager.models.Service] """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_py3.py index a600dfe262e6..23e63e184112 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_py3.py @@ -13,7 +13,7 @@ class Rollout(TrackedResource): - """Defines the rollout resource. + """Defines the rollout. Variables are only populated by the server, and will be ignored when sending a request. @@ -36,13 +36,14 @@ class Rollout(TrackedResource): :type identity: ~azure.mgmt.deploymentmanager.models.Identity :param build_version: Required. The version of the build being deployed. :type build_version: str - :param artifact_source_id: The reference to the ARM resource Id where the - payload is located. + :param artifact_source_id: The reference to the artifact source resource + Id where the payload is located. :type artifact_source_id: str - :param target_service_topology_id: Required. The reference to the resource - Id of the service topology from which services are chosen to be deployed. + :param target_service_topology_id: Required. The resource Id of the + service topology from which service units are being referenced in step + groups to be deployed. :type target_service_topology_id: str - :param step_groups: Required. The list of steps that define the + :param step_groups: Required. The list of step groups that define the orchestration. :type step_groups: list[~azure.mgmt.deploymentmanager.models.Step] :ivar status: The current status of the rollout. @@ -53,8 +54,7 @@ class Rollout(TrackedResource): :ivar operation_info: Operational information of the rollout. :vartype operation_info: ~azure.mgmt.deploymentmanager.models.RolloutOperationInfo - :ivar services: Set of detailed step result information on target resource - groups. + :ivar services: The detailed information on the services being deployed. :vartype services: list[~azure.mgmt.deploymentmanager.models.Service] """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request.py index b783f1bd11e1..78588600ba34 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request.py @@ -13,7 +13,7 @@ class RolloutRequest(TrackedResource): - """Defines the resource format for creating a rollout. + """Defines the PUT rollout request body. Variables are only populated by the server, and will be ignored when sending a request. @@ -36,13 +36,14 @@ class RolloutRequest(TrackedResource): :type identity: ~azure.mgmt.deploymentmanager.models.Identity :param build_version: Required. The version of the build being deployed. :type build_version: str - :param artifact_source_id: The reference to the ARM resource Id where the - payload is located. + :param artifact_source_id: The reference to the artifact source resource + Id where the payload is located. :type artifact_source_id: str - :param target_service_topology_id: Required. The reference to the resource - Id of the service topology from which services are chosen to be deployed. + :param target_service_topology_id: Required. The resource Id of the + service topology from which service units are being referenced in step + groups to be deployed. :type target_service_topology_id: str - :param step_groups: Required. The list of steps that define the + :param step_groups: Required. The list of step groups that define the orchestration. :type step_groups: list[~azure.mgmt.deploymentmanager.models.Step] """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request_py3.py index 51dd8d7881ce..f2f73a5ab7e6 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_request_py3.py @@ -13,7 +13,7 @@ class RolloutRequest(TrackedResource): - """Defines the resource format for creating a rollout. + """Defines the PUT rollout request body. Variables are only populated by the server, and will be ignored when sending a request. @@ -36,13 +36,14 @@ class RolloutRequest(TrackedResource): :type identity: ~azure.mgmt.deploymentmanager.models.Identity :param build_version: Required. The version of the build being deployed. :type build_version: str - :param artifact_source_id: The reference to the ARM resource Id where the - payload is located. + :param artifact_source_id: The reference to the artifact source resource + Id where the payload is located. :type artifact_source_id: str - :param target_service_topology_id: Required. The reference to the resource - Id of the service topology from which services are chosen to be deployed. + :param target_service_topology_id: Required. The resource Id of the + service topology from which service units are being referenced in step + groups to be deployed. :type target_service_topology_id: str - :param step_groups: Required. The list of steps that define the + :param step_groups: Required. The list of step groups that define the orchestration. :type step_groups: list[~azure.mgmt.deploymentmanager.models.Step] """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step.py index ef4fc7e0ce8b..6201f4beb5ba 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step.py @@ -20,8 +20,7 @@ class RolloutStep(Model): All required parameters must be populated in order to send to Azure. - :param name: Required. Name of the step as specified in the rollout - specification input artifact. + :param name: Required. Name of the step. :type name: str :ivar status: Current state of the step. :vartype status: str @@ -30,8 +29,8 @@ class RolloutStep(Model): :ivar operation_info: Detailed information of specific action execution. :vartype operation_info: ~azure.mgmt.deploymentmanager.models.StepOperationInfo - :ivar resource_operations: Set of resource operations that were performed - on the Azure resource that the action acted upon. + :ivar resource_operations: Set of resource operations that were performed, + if any, on an Azure resource. :vartype resource_operations: list[~azure.mgmt.deploymentmanager.models.ResourceOperation] :ivar messages: Supplementary informative messages during rollout. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step_py3.py index 2cf1d30e547d..2ce0f2807c92 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/rollout_step_py3.py @@ -20,8 +20,7 @@ class RolloutStep(Model): All required parameters must be populated in order to send to Azure. - :param name: Required. Name of the step as specified in the rollout - specification input artifact. + :param name: Required. Name of the step. :type name: str :ivar status: Current state of the step. :vartype status: str @@ -30,8 +29,8 @@ class RolloutStep(Model): :ivar operation_info: Detailed information of specific action execution. :vartype operation_info: ~azure.mgmt.deploymentmanager.models.StepOperationInfo - :ivar resource_operations: Set of resource operations that were performed - on the Azure resource that the action acted upon. + :ivar resource_operations: Set of resource operations that were performed, + if any, on an Azure resource. :vartype resource_operations: list[~azure.mgmt.deploymentmanager.models.ResourceOperation] :ivar messages: Supplementary informative messages during rollout. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication.py index 1f6ad8a2a7c3..4901ca0a0297 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication.py @@ -13,15 +13,16 @@ class SasAuthentication(Authentication): - """Defines the authentication properties to access the artifacts using Azure - Storage SAS URI. + """Defines the properties to access the artifacts using an Azure Storage SAS + URI. All required parameters must be populated in order to send to Azure. :param type: Required. Constant filled by server. :type type: str - :param sas_uri: Required. The complete SAS URI to the location of the - artifacts. + :param sas_uri: Required. The SAS URI to the Azure Storage blob container. + Any offset from the root of the container to where the artifacts are + located can be defined in the artifactRoot. :type sas_uri: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication_py3.py index b7ed5a7bd323..450369cc1574 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/sas_authentication_py3.py @@ -13,15 +13,16 @@ class SasAuthentication(Authentication): - """Defines the authentication properties to access the artifacts using Azure - Storage SAS URI. + """Defines the properties to access the artifacts using an Azure Storage SAS + URI. All required parameters must be populated in order to send to Azure. :param type: Required. Constant filled by server. :type type: str - :param sas_uri: Required. The complete SAS URI to the location of the - artifacts. + :param sas_uri: Required. The SAS URI to the Azure Storage blob container. + Any offset from the root of the container to where the artifacts are + located can be defined in the artifactRoot. :type sas_uri: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service.py index 18e89d5eaed9..9e4b37b21344 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service.py @@ -18,10 +18,10 @@ class Service(ServiceProperties): All required parameters must be populated in order to send to Azure. :param target_location: Required. The Azure location to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_location: str :param target_subscription_id: Required. The subscription to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_subscription_id: str :param name: Name of the service. :type name: str diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties.py index 0207a7a1eda9..68528981e030 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties.py @@ -18,10 +18,10 @@ class ServiceProperties(Model): All required parameters must be populated in order to send to Azure. :param target_location: Required. The Azure location to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_location: str :param target_subscription_id: Required. The subscription to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_subscription_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties_py3.py index fe8ad76f8646..0abfc872cd7d 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_properties_py3.py @@ -18,10 +18,10 @@ class ServiceProperties(Model): All required parameters must be populated in order to send to Azure. :param target_location: Required. The Azure location to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_location: str :param target_subscription_id: Required. The subscription to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_subscription_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_py3.py index d7c4c1fe8c82..8747205e5bd4 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_py3.py @@ -18,10 +18,10 @@ class Service(ServiceProperties): All required parameters must be populated in order to send to Azure. :param target_location: Required. The Azure location to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_location: str :param target_subscription_id: Required. The subscription to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_subscription_id: str :param name: Name of the service. :type name: str diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource.py index d02384910017..db530c7e4ddc 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource.py @@ -13,7 +13,7 @@ class ServiceResource(TrackedResource): - """The resource representation of a service in a topology. + """The resource representation of a service in a service topology. Variables are only populated by the server, and will be ignored when sending a request. @@ -33,10 +33,10 @@ class ServiceResource(TrackedResource): :param location: Required. The geo-location where the resource lives :type location: str :param target_location: Required. The Azure location to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_location: str :param target_subscription_id: Required. The subscription to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_subscription_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource_py3.py index 74158b85282d..35f0193e405b 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_resource_py3.py @@ -13,7 +13,7 @@ class ServiceResource(TrackedResource): - """The resource representation of a service in a topology. + """The resource representation of a service in a service topology. Variables are only populated by the server, and will be ignored when sending a request. @@ -33,10 +33,10 @@ class ServiceResource(TrackedResource): :param location: Required. The geo-location where the resource lives :type location: str :param target_location: Required. The Azure location to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_location: str :param target_subscription_id: Required. The subscription to which the - resources in the service belong to. + resources in the service belong to or should be deployed to. :type target_subscription_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties.py index 6298f3bcf5a9..88da92173426 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties.py @@ -15,8 +15,8 @@ class ServiceTopologyProperties(Model): """The properties of a service topology. - :param artifact_source_id: The artifact source that contains the artifacts - that can be referenced in the service units. + :param artifact_source_id: The resource Id of the artifact source that + contains the artifacts that can be referenced in the service units. :type artifact_source_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties_py3.py index cd7a09635eb7..49a5bfd03a38 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_properties_py3.py @@ -15,8 +15,8 @@ class ServiceTopologyProperties(Model): """The properties of a service topology. - :param artifact_source_id: The artifact source that contains the artifacts - that can be referenced in the service units. + :param artifact_source_id: The resource Id of the artifact source that + contains the artifacts that can be referenced in the service units. :type artifact_source_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource.py index d3a79b9ee37c..c19d1f94e90e 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource.py @@ -32,8 +32,8 @@ class ServiceTopologyResource(TrackedResource): :type tags: dict[str, str] :param location: Required. The geo-location where the resource lives :type location: str - :param artifact_source_id: The artifact source that contains the artifacts - that can be referenced in the service units. + :param artifact_source_id: The resource Id of the artifact source that + contains the artifacts that can be referenced in the service units. :type artifact_source_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource_py3.py index c2645004b3e6..c73cc620ccfa 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_topology_resource_py3.py @@ -32,8 +32,8 @@ class ServiceTopologyResource(TrackedResource): :type tags: dict[str, str] :param location: Required. The geo-location where the resource lives :type location: str - :param artifact_source_id: The artifact source that contains the artifacts - that can be referenced in the service units. + :param artifact_source_id: The resource Id of the artifact source that + contains the artifacts that can be referenced in the service units. :type artifact_source_id: str """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit.py index b642fca18a6b..d180b1f4ec18 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit.py @@ -18,7 +18,7 @@ class ServiceUnit(ServiceUnitProperties): All required parameters must be populated in order to send to Azure. :param target_resource_group: Required. The Azure Resource Group to which - the resources in the service unit belong to. + the resources in the service unit belong to or should be deployed to. :type target_resource_group: str :param deployment_mode: Required. Describes the type of ARM deployment to be performed on the resource. Possible values include: 'Incremental', diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties.py index 657003294f17..652cf0fac33c 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties.py @@ -18,7 +18,7 @@ class ServiceUnitProperties(Model): All required parameters must be populated in order to send to Azure. :param target_resource_group: Required. The Azure Resource Group to which - the resources in the service unit belong to. + the resources in the service unit belong to or should be deployed to. :type target_resource_group: str :param deployment_mode: Required. Describes the type of ARM deployment to be performed on the resource. Possible values include: 'Incremental', diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties_py3.py index be4d95c28749..bdfbd4d6efa1 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_properties_py3.py @@ -18,7 +18,7 @@ class ServiceUnitProperties(Model): All required parameters must be populated in order to send to Azure. :param target_resource_group: Required. The Azure Resource Group to which - the resources in the service unit belong to. + the resources in the service unit belong to or should be deployed to. :type target_resource_group: str :param deployment_mode: Required. Describes the type of ARM deployment to be performed on the resource. Possible values include: 'Incremental', diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_py3.py index 129517e8d7fc..3d5852a53e06 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_py3.py @@ -18,7 +18,7 @@ class ServiceUnit(ServiceUnitProperties): All required parameters must be populated in order to send to Azure. :param target_resource_group: Required. The Azure Resource Group to which - the resources in the service unit belong to. + the resources in the service unit belong to or should be deployed to. :type target_resource_group: str :param deployment_mode: Required. Describes the type of ARM deployment to be performed on the resource. Possible values include: 'Incremental', diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource.py index ab15b71cd9f3..17a5b0fc3dd9 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource.py @@ -33,7 +33,7 @@ class ServiceUnitResource(TrackedResource): :param location: Required. The geo-location where the resource lives :type location: str :param target_resource_group: Required. The Azure Resource Group to which - the resources in the service unit belong to. + the resources in the service unit belong to or should be deployed to. :type target_resource_group: str :param deployment_mode: Required. Describes the type of ARM deployment to be performed on the resource. Possible values include: 'Incremental', diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource_py3.py index 6ca8d05b44c2..91a6f7798df8 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/service_unit_resource_py3.py @@ -33,7 +33,7 @@ class ServiceUnitResource(TrackedResource): :param location: Required. The geo-location where the resource lives :type location: str :param target_resource_group: Required. The Azure Resource Group to which - the resources in the service unit belong to. + the resources in the service unit belong to or should be deployed to. :type target_resource_group: str :param deployment_mode: Required. Describes the type of ARM deployment to be performed on the resource. Possible values include: 'Incremental', diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step.py index 3d3888d00b8e..babe264bc0b0 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step.py @@ -17,20 +17,21 @@ class Step(Model): All required parameters must be populated in order to send to Azure. - :param name: Required. The name of the step. + :param name: Required. The name of the step group. :type name: str - :param depends_on_step_group: The list of step names on which this step - depends. - :type depends_on_step_group: list[str] - :param pre_deployment_steps: The list of step names to be run before - deploying the target. + :param depends_on_step_groups: The list of step group names on which this + step group depends on. + :type depends_on_step_groups: list[str] + :param pre_deployment_steps: The list of steps to be run before deploying + the target. :type pre_deployment_steps: list[~azure.mgmt.deploymentmanager.models.PrePostStep] - :param deployment_target_id: Required. The reference to the ARM service - unit resource to be deployed. + :param deployment_target_id: Required. The resource Id of service unit to + be deployed. The service unit should be from the service topology + referenced in targetServiceTopologyId :type deployment_target_id: str - :param post_deployment_steps: The list of step names to be run after - deploying the target. + :param post_deployment_steps: The list of steps to be run after deploying + the target. :type post_deployment_steps: list[~azure.mgmt.deploymentmanager.models.PrePostStep] """ @@ -42,7 +43,7 @@ class Step(Model): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, - 'depends_on_step_group': {'key': 'dependsOnStepGroup', 'type': '[str]'}, + 'depends_on_step_groups': {'key': 'dependsOnStepGroups', 'type': '[str]'}, 'pre_deployment_steps': {'key': 'preDeploymentSteps', 'type': '[PrePostStep]'}, 'deployment_target_id': {'key': 'deploymentTargetId', 'type': 'str'}, 'post_deployment_steps': {'key': 'postDeploymentSteps', 'type': '[PrePostStep]'}, @@ -51,7 +52,7 @@ class Step(Model): def __init__(self, **kwargs): super(Step, self).__init__(**kwargs) self.name = kwargs.get('name', None) - self.depends_on_step_group = kwargs.get('depends_on_step_group', None) + self.depends_on_step_groups = kwargs.get('depends_on_step_groups', None) self.pre_deployment_steps = kwargs.get('pre_deployment_steps', None) self.deployment_target_id = kwargs.get('deployment_target_id', None) self.post_deployment_steps = kwargs.get('post_deployment_steps', None) diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info.py index 491a1d747698..de7bf27165ed 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info.py @@ -13,13 +13,13 @@ class StepOperationInfo(Model): - """Detailed information of specific step execution. + """Detailed information of a specific step run. Variables are only populated by the server, and will be ignored when sending a request. - :ivar deployment_name: The name of the Azure Resource Manager deployment - initiated as part of the step. + :ivar deployment_name: The name of the ARM deployment initiated as part of + the step. :vartype deployment_name: str :ivar correlation_id: Unique identifier to track the request for ARM-based resources. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info_py3.py index bc200e09fd68..f04ffbf3f139 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_operation_info_py3.py @@ -13,13 +13,13 @@ class StepOperationInfo(Model): - """Detailed information of specific step execution. + """Detailed information of a specific step run. Variables are only populated by the server, and will be ignored when sending a request. - :ivar deployment_name: The name of the Azure Resource Manager deployment - initiated as part of the step. + :ivar deployment_name: The name of the ARM deployment initiated as part of + the step. :vartype deployment_name: str :ivar correlation_id: Unique identifier to track the request for ARM-based resources. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_py3.py index 153df41e238c..e8c2c97158e5 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_py3.py @@ -17,20 +17,21 @@ class Step(Model): All required parameters must be populated in order to send to Azure. - :param name: Required. The name of the step. + :param name: Required. The name of the step group. :type name: str - :param depends_on_step_group: The list of step names on which this step - depends. - :type depends_on_step_group: list[str] - :param pre_deployment_steps: The list of step names to be run before - deploying the target. + :param depends_on_step_groups: The list of step group names on which this + step group depends on. + :type depends_on_step_groups: list[str] + :param pre_deployment_steps: The list of steps to be run before deploying + the target. :type pre_deployment_steps: list[~azure.mgmt.deploymentmanager.models.PrePostStep] - :param deployment_target_id: Required. The reference to the ARM service - unit resource to be deployed. + :param deployment_target_id: Required. The resource Id of service unit to + be deployed. The service unit should be from the service topology + referenced in targetServiceTopologyId :type deployment_target_id: str - :param post_deployment_steps: The list of step names to be run after - deploying the target. + :param post_deployment_steps: The list of steps to be run after deploying + the target. :type post_deployment_steps: list[~azure.mgmt.deploymentmanager.models.PrePostStep] """ @@ -42,16 +43,16 @@ class Step(Model): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, - 'depends_on_step_group': {'key': 'dependsOnStepGroup', 'type': '[str]'}, + 'depends_on_step_groups': {'key': 'dependsOnStepGroups', 'type': '[str]'}, 'pre_deployment_steps': {'key': 'preDeploymentSteps', 'type': '[PrePostStep]'}, 'deployment_target_id': {'key': 'deploymentTargetId', 'type': 'str'}, 'post_deployment_steps': {'key': 'postDeploymentSteps', 'type': '[PrePostStep]'}, } - def __init__(self, *, name: str, deployment_target_id: str, depends_on_step_group=None, pre_deployment_steps=None, post_deployment_steps=None, **kwargs) -> None: + def __init__(self, *, name: str, deployment_target_id: str, depends_on_step_groups=None, pre_deployment_steps=None, post_deployment_steps=None, **kwargs) -> None: super(Step, self).__init__(**kwargs) self.name = name - self.depends_on_step_group = depends_on_step_group + self.depends_on_step_groups = depends_on_step_groups self.pre_deployment_steps = pre_deployment_steps self.deployment_target_id = deployment_target_id self.post_deployment_steps = post_deployment_steps diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource.py index 36b3be528b9b..1a33362fbe96 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource.py @@ -13,7 +13,7 @@ class StepResource(TrackedResource): - """The resource representation of a deployment step. + """The resource representation of a rollout step. Variables are only populated by the server, and will be ignored when sending a request. @@ -32,7 +32,7 @@ class StepResource(TrackedResource): :type tags: dict[str, str] :param location: Required. The geo-location where the resource lives :type location: str - :param properties: Required. The properties for the resource. + :param properties: Required. The properties that define the step. :type properties: ~azure.mgmt.deploymentmanager.models.StepProperties """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource_py3.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource_py3.py index 200c6c288aae..a3cd19a871c1 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource_py3.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/models/step_resource_py3.py @@ -13,7 +13,7 @@ class StepResource(TrackedResource): - """The resource representation of a deployment step. + """The resource representation of a rollout step. Variables are only populated by the server, and will be ignored when sending a request. @@ -32,7 +32,7 @@ class StepResource(TrackedResource): :type tags: dict[str, str] :param location: Required. The geo-location where the resource lives :type location: str - :param properties: Required. The properties for the resource. + :param properties: Required. The properties that define the step. :type properties: ~azure.mgmt.deploymentmanager.models.StepProperties """ diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/artifact_sources_operations.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/artifact_sources_operations.py index a6965f774bd5..9f07092c0c0a 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/artifact_sources_operations.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/artifact_sources_operations.py @@ -39,7 +39,7 @@ def __init__(self, client, config, serializer, deserializer): def create_or_update( self, resource_group_name, artifact_source_name, artifact_source_info=None, custom_headers=None, raw=False, **operation_config): - """Creates or updates an Artifact source. + """Creates or updates an artifact source. Synchronously creates a new artifact source or updates an existing artifact source. @@ -115,7 +115,7 @@ def create_or_update( def get( self, resource_group_name, artifact_source_name, custom_headers=None, raw=False, **operation_config): - """Gets an artifact resource. + """Gets an artifact source. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -178,7 +178,7 @@ def get( def delete( self, resource_group_name, artifact_source_name, custom_headers=None, raw=False, **operation_config): - """Deletes an artifact source resource. + """Deletes an artifact source. :param resource_group_name: The name of the resource group. The name is case insensitive. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/rollouts_operations.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/rollouts_operations.py index d6607591e861..02e882420c56 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/rollouts_operations.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/rollouts_operations.py @@ -159,7 +159,7 @@ def get_long_running_output(response): def get( self, resource_group_name, rollout_name, retry_attempt=None, custom_headers=None, raw=False, **operation_config): - """Gets detailed information of an ongoing or completed rollout. + """Gets detailed information of a rollout. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -229,7 +229,7 @@ def delete( self, resource_group_name, rollout_name, custom_headers=None, raw=False, **operation_config): """Deletes a rollout resource. - A rollout can only be deleted if it is in a terminal state. + Only rollouts in terminal state can be deleted. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -285,7 +285,7 @@ def cancel( self, resource_group_name, rollout_name, custom_headers=None, raw=False, **operation_config): """Stops a running rollout. - A rollout can be canceled only if it is in running state. + Only running rollouts can be canceled. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -350,7 +350,7 @@ def restart( self, resource_group_name, rollout_name, skip_succeeded=None, custom_headers=None, raw=False, **operation_config): """Restarts a failed rollout and optionally skips all succeeded steps. - A rollout can be restarted only if is in a terminal state and failed. + Only failed rollouts can be restarted. :param resource_group_name: The name of the resource group. The name is case insensitive. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_topologies_operations.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_topologies_operations.py index 02cdf90a433e..dfa9f8b0180f 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_topologies_operations.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_topologies_operations.py @@ -113,7 +113,7 @@ def create_or_update( def get( self, resource_group_name, service_topology_name, custom_headers=None, raw=False, **operation_config): - """Gets a topology resource. + """Gets the service topology. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -176,7 +176,7 @@ def get( def delete( self, resource_group_name, service_topology_name, custom_headers=None, raw=False, **operation_config): - """Deletes a topology resource. + """Deletes the service topology. :param resource_group_name: The name of the resource group. The name is case insensitive. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_units_operations.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_units_operations.py index a21dd0c9da6d..56779520a0ab 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_units_operations.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/service_units_operations.py @@ -98,8 +98,8 @@ def _create_or_update_initial( def create_or_update( self, resource_group_name, service_topology_name, service_name, service_unit_name, service_unit_info, custom_headers=None, raw=False, polling=True, **operation_config): - """Creates or updates a service unit in the service within the referenced - topology resource. + """Creates or updates a service unit under the service in the service + topology. This is an asynchronous operation and can be polled to completion using the operation resource returned by this operation. @@ -164,7 +164,7 @@ def get_long_running_output(response): def get( self, resource_group_name, service_topology_name, service_name, service_unit_name, custom_headers=None, raw=False, **operation_config): - """Gets a service unit resource. + """Gets the service unit. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -233,7 +233,7 @@ def get( def delete( self, resource_group_name, service_topology_name, service_name, service_unit_name, custom_headers=None, raw=False, **operation_config): - """Deletes a service unit resource. + """Deletes the service unit. :param resource_group_name: The name of the resource group. The name is case insensitive. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/services_operations.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/services_operations.py index 171c481f58e1..deb03e2a645e 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/services_operations.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/services_operations.py @@ -39,7 +39,7 @@ def __init__(self, client, config, serializer, deserializer): def create_or_update( self, resource_group_name, service_topology_name, service_name, service_info, custom_headers=None, raw=False, **operation_config): - """Creates or updates a service in the topology. + """Creates or updates a service in the service topology. Synchronously creates a new service or updates an existing service. @@ -50,7 +50,7 @@ def create_or_update( :type service_topology_name: str :param service_name: The name of the service resource. :type service_name: str - :param service_info: The topoogy group resource object + :param service_info: The service object :type service_info: ~azure.mgmt.deploymentmanager.models.ServiceResource :param dict custom_headers: headers that will be added to the request @@ -114,7 +114,7 @@ def create_or_update( def get( self, resource_group_name, service_topology_name, service_name, custom_headers=None, raw=False, **operation_config): - """Gets a service resource. + """Gets the service. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -180,7 +180,7 @@ def get( def delete( self, resource_group_name, service_topology_name, service_name, custom_headers=None, raw=False, **operation_config): - """Deletes a service resource. + """Deletes the service. :param resource_group_name: The name of the resource group. The name is case insensitive. diff --git a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/steps_operations.py b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/steps_operations.py index daa98694ad85..eeb12488c11b 100644 --- a/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/steps_operations.py +++ b/azure-mgmt-deploymentmanager/azure/mgmt/deploymentmanager/operations/steps_operations.py @@ -39,7 +39,7 @@ def __init__(self, client, config, serializer, deserializer): def create_or_update( self, resource_group_name, step_name, step_info=None, custom_headers=None, raw=False, **operation_config): - """Creates or updates a deployment step. + """Creates or updates a rollout step with the given step properties. Synchronously creates a new step or updates an existing step. @@ -48,7 +48,7 @@ def create_or_update( :type resource_group_name: str :param step_name: The name of the deployment step. :type step_name: str - :param step_info: The resource object. + :param step_info: The step object. :type step_info: ~azure.mgmt.deploymentmanager.models.StepResource :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -113,7 +113,7 @@ def create_or_update( def get( self, resource_group_name, step_name, custom_headers=None, raw=False, **operation_config): - """Gets a topology resource. + """Gets the step. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -176,7 +176,7 @@ def get( def delete( self, resource_group_name, step_name, custom_headers=None, raw=False, **operation_config): - """Deletes a deployment step. + """Deletes the step. :param resource_group_name: The name of the resource group. The name is case insensitive. diff --git a/azure-mgmt-deploymentmanager/azure_bdist_wheel.py b/azure-mgmt-deploymentmanager/azure_bdist_wheel.py deleted file mode 100644 index 8a81d1b61775..000000000000 --- a/azure-mgmt-deploymentmanager/azure_bdist_wheel.py +++ /dev/null @@ -1,54 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -#-------------------------------------------------------------------------- - -from distutils import log as logger -import os.path - -from wheel.bdist_wheel import bdist_wheel -class azure_bdist_wheel(bdist_wheel): - """The purpose of this class is to build wheel a little differently than the sdist, - without requiring to build the wheel from the sdist (i.e. you can build the wheel - directly from source). - """ - - description = "Create an Azure wheel distribution" - - user_options = bdist_wheel.user_options + \ - [('azure-namespace-package=', None, - "Name of the deepest nspkg used")] - - def initialize_options(self): - bdist_wheel.initialize_options(self) - self.azure_namespace_package = None - - def finalize_options(self): - bdist_wheel.finalize_options(self) - if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"): - raise ValueError("azure_namespace_package must finish by -nspkg") - - def run(self): - if not self.distribution.install_requires: - self.distribution.install_requires = [] - self.distribution.install_requires.append( - "{}>=2.0.0".format(self.azure_namespace_package)) - bdist_wheel.run(self) - - def write_record(self, bdist_dir, distinfo_dir): - if self.azure_namespace_package: - # Split and remove last part, assuming it's "nspkg" - subparts = self.azure_namespace_package.split('-')[0:-1] - folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))] - for azure_sub_package in folder_with_init: - init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py') - if os.path.isfile(init_file): - logger.info("manually remove {} while building the wheel".format(init_file)) - os.remove(init_file) - else: - raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file)) - bdist_wheel.write_record(self, bdist_dir, distinfo_dir) -cmdclass = { - 'bdist_wheel': azure_bdist_wheel, -} diff --git a/azure-mgmt-deploymentmanager/setup.cfg b/azure-mgmt-deploymentmanager/setup.cfg index 856f4164982c..3c6e79cf31da 100644 --- a/azure-mgmt-deploymentmanager/setup.cfg +++ b/azure-mgmt-deploymentmanager/setup.cfg @@ -1,3 +1,2 @@ [bdist_wheel] universal=1 -azure-namespace-package=azure-mgmt-nspkg \ No newline at end of file diff --git a/azure-mgmt-deploymentmanager/setup.py b/azure-mgmt-deploymentmanager/setup.py index 06179bcc1813..b48622ed6e4e 100644 --- a/azure-mgmt-deploymentmanager/setup.py +++ b/azure-mgmt-deploymentmanager/setup.py @@ -10,12 +10,6 @@ import os.path from io import open from setuptools import find_packages, setup -try: - from azure_bdist_wheel import cmdclass -except ImportError: - from distutils import log as logger - logger.warn("Wheel is not available, disabling bdist_wheel hook") - cmdclass = {} # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "azure-mgmt-deploymentmanager" @@ -76,11 +70,18 @@ 'License :: OSI Approved :: MIT License', ], zip_safe=False, - packages=find_packages(exclude=["tests"]), + packages=find_packages(exclude=[ + 'tests', + # Exclude packages that will be covered by PEP420 or nspkg + 'azure', + 'azure.mgmt', + ]), install_requires=[ 'msrest>=0.5.0', 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], - cmdclass=cmdclass + extras_require={ + ":python_version<'3.0'": ['azure-mgmt-nspkg'], + } )