diff --git a/azure-mgmt-servicefabric/MANIFEST.in b/azure-mgmt-servicefabric/MANIFEST.in index bb37a2723dae..e4884efef41b 100644 --- a/azure-mgmt-servicefabric/MANIFEST.in +++ b/azure-mgmt-servicefabric/MANIFEST.in @@ -1 +1,5 @@ +recursive-include tests *.py *.yaml include *.rst +include azure/__init__.py +include azure/mgmt/__init__.py + diff --git a/azure-mgmt-servicefabric/README.rst b/azure-mgmt-servicefabric/README.rst index 41ca1c06e3d0..818c9340559d 100644 --- a/azure-mgmt-servicefabric/README.rst +++ b/azure-mgmt-servicefabric/README.rst @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see For a more complete set of Azure libraries, see the `azure `__ bundle package. -Compatibility -============= - -**IMPORTANT**: If you have an earlier version of the azure package -(version < 1.0), you should uninstall it before installing this package. - -You can check the version using pip: - -.. code:: shell - - pip freeze - -If you see azure==0.11.0 (or any version below 1.0), uninstall it first: - -.. code:: shell - - pip uninstall azure - - Usage ===== diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/__init__.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/__init__.py index dc7ffdb0c25f..f573e75337b1 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/__init__.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/__init__.py @@ -10,48 +10,23 @@ # -------------------------------------------------------------------------- try: + from .service_type_delta_health_policy_py3 import ServiceTypeDeltaHealthPolicy + from .application_delta_health_policy_py3 import ApplicationDeltaHealthPolicy from .service_type_health_policy_py3 import ServiceTypeHealthPolicy - from .service_type_health_policy_map_item_py3 import ServiceTypeHealthPolicyMapItem from .application_health_policy_py3 import ApplicationHealthPolicy - from .application_metric_description_py3 import ApplicationMetricDescription - from .application_parameter_py3 import ApplicationParameter - from .service_correlation_description_py3 import ServiceCorrelationDescription - from .service_load_metric_description_py3 import ServiceLoadMetricDescription - from .service_placement_policy_description_py3 import ServicePlacementPolicyDescription - from .partition_scheme_description_py3 import PartitionSchemeDescription - from .named_partition_scheme_description_py3 import NamedPartitionSchemeDescription - from .singleton_partition_scheme_description_py3 import SingletonPartitionSchemeDescription - from .uniform_int64_range_partition_scheme_description_py3 import UniformInt64RangePartitionSchemeDescription - from .application_type_resource_py3 import ApplicationTypeResource - from .application_type_resource_list_py3 import ApplicationTypeResourceList - from .version_resource_py3 import VersionResource - from .version_resource_list_py3 import VersionResourceList - from .application_resource_py3 import ApplicationResource - from .application_resource_list_py3 import ApplicationResourceList - from .rolling_upgrade_monitoring_policy_py3 import RollingUpgradeMonitoringPolicy - from .application_upgrade_policy_py3 import ApplicationUpgradePolicy - from .application_resource_update_py3 import ApplicationResourceUpdate - from .service_properties_py3 import ServiceProperties - from .service_resource_py3 import ServiceResource - from .service_resource_list_py3 import ServiceResourceList - from .service_properties_base_py3 import ServicePropertiesBase - from .service_update_properties_py3 import ServiceUpdateProperties - from .service_resource_update_py3 import ServiceResourceUpdate - from .stateless_service_properties_py3 import StatelessServiceProperties - from .stateless_service_update_properties_py3 import StatelessServiceUpdateProperties - from .stateful_service_properties_py3 import StatefulServiceProperties - from .stateful_service_update_properties_py3 import StatefulServiceUpdateProperties from .available_operation_display_py3 import AvailableOperationDisplay from .azure_active_directory_py3 import AzureActiveDirectory from .certificate_description_py3 import CertificateDescription from .client_certificate_common_name_py3 import ClientCertificateCommonName from .client_certificate_thumbprint_py3 import ClientCertificateThumbprint from .cluster_version_details_py3 import ClusterVersionDetails + from .server_certificate_common_name_py3 import ServerCertificateCommonName + from .server_certificate_common_names_py3 import ServerCertificateCommonNames + from .diagnostics_storage_account_config_py3 import DiagnosticsStorageAccountConfig from .settings_parameter_description_py3 import SettingsParameterDescription from .settings_section_description_py3 import SettingsSectionDescription from .endpoint_range_description_py3 import EndpointRangeDescription from .node_type_description_py3 import NodeTypeDescription - from .diagnostics_storage_account_config_py3 import DiagnosticsStorageAccountConfig from .cluster_health_policy_py3 import ClusterHealthPolicy from .cluster_upgrade_delta_health_policy_py3 import ClusterUpgradeDeltaHealthPolicy from .cluster_upgrade_policy_py3 import ClusterUpgradePolicy @@ -60,54 +35,58 @@ from .cluster_code_versions_list_result_py3 import ClusterCodeVersionsListResult from .cluster_list_result_py3 import ClusterListResult from .cluster_update_parameters_py3 import ClusterUpdateParameters - from .error_model_py3 import ErrorModel, ErrorModelException from .operation_result_py3 import OperationResult - from .proxy_resource_py3 import ProxyResource from .resource_py3 import Resource - from .service_type_delta_health_policy_py3 import ServiceTypeDeltaHealthPolicy + from .error_model_error_py3 import ErrorModelError + from .error_model_py3 import ErrorModel, ErrorModelException + from .application_metric_description_py3 import ApplicationMetricDescription + from .application_resource_py3 import ApplicationResource + from .application_resource_list_py3 import ApplicationResourceList + from .arm_rolling_upgrade_monitoring_policy_py3 import ArmRollingUpgradeMonitoringPolicy + from .arm_service_type_health_policy_py3 import ArmServiceTypeHealthPolicy + from .arm_application_health_policy_py3 import ArmApplicationHealthPolicy + from .application_upgrade_policy_py3 import ApplicationUpgradePolicy + from .application_resource_update_py3 import ApplicationResourceUpdate + from .application_type_resource_py3 import ApplicationTypeResource + from .application_type_resource_list_py3 import ApplicationTypeResourceList + from .application_type_version_resource_py3 import ApplicationTypeVersionResource + from .application_type_version_resource_list_py3 import ApplicationTypeVersionResourceList + from .service_correlation_description_py3 import ServiceCorrelationDescription + from .named_partition_scheme_description_py3 import NamedPartitionSchemeDescription + from .partition_scheme_description_py3 import PartitionSchemeDescription + from .proxy_resource_py3 import ProxyResource + from .service_load_metric_description_py3 import ServiceLoadMetricDescription + from .service_placement_policy_description_py3 import ServicePlacementPolicyDescription + from .service_resource_properties_py3 import ServiceResourceProperties + from .service_resource_py3 import ServiceResource + from .service_resource_list_py3 import ServiceResourceList + from .service_resource_properties_base_py3 import ServiceResourcePropertiesBase + from .service_resource_update_properties_py3 import ServiceResourceUpdateProperties + from .service_resource_update_py3 import ServiceResourceUpdate + from .singleton_partition_scheme_description_py3 import SingletonPartitionSchemeDescription + from .stateful_service_properties_py3 import StatefulServiceProperties + from .stateful_service_update_properties_py3 import StatefulServiceUpdateProperties + from .stateless_service_properties_py3 import StatelessServiceProperties + from .stateless_service_update_properties_py3 import StatelessServiceUpdateProperties + from .uniform_int64_range_partition_scheme_description_py3 import UniformInt64RangePartitionSchemeDescription except (SyntaxError, ImportError): + from .service_type_delta_health_policy import ServiceTypeDeltaHealthPolicy + from .application_delta_health_policy import ApplicationDeltaHealthPolicy from .service_type_health_policy import ServiceTypeHealthPolicy - from .service_type_health_policy_map_item import ServiceTypeHealthPolicyMapItem from .application_health_policy import ApplicationHealthPolicy - from .application_metric_description import ApplicationMetricDescription - from .application_parameter import ApplicationParameter - from .service_correlation_description import ServiceCorrelationDescription - from .service_load_metric_description import ServiceLoadMetricDescription - from .service_placement_policy_description import ServicePlacementPolicyDescription - from .partition_scheme_description import PartitionSchemeDescription - from .named_partition_scheme_description import NamedPartitionSchemeDescription - from .singleton_partition_scheme_description import SingletonPartitionSchemeDescription - from .uniform_int64_range_partition_scheme_description import UniformInt64RangePartitionSchemeDescription - from .application_type_resource import ApplicationTypeResource - from .application_type_resource_list import ApplicationTypeResourceList - from .version_resource import VersionResource - from .version_resource_list import VersionResourceList - from .application_resource import ApplicationResource - from .application_resource_list import ApplicationResourceList - from .rolling_upgrade_monitoring_policy import RollingUpgradeMonitoringPolicy - from .application_upgrade_policy import ApplicationUpgradePolicy - from .application_resource_update import ApplicationResourceUpdate - from .service_properties import ServiceProperties - from .service_resource import ServiceResource - from .service_resource_list import ServiceResourceList - from .service_properties_base import ServicePropertiesBase - from .service_update_properties import ServiceUpdateProperties - from .service_resource_update import ServiceResourceUpdate - from .stateless_service_properties import StatelessServiceProperties - from .stateless_service_update_properties import StatelessServiceUpdateProperties - from .stateful_service_properties import StatefulServiceProperties - from .stateful_service_update_properties import StatefulServiceUpdateProperties from .available_operation_display import AvailableOperationDisplay from .azure_active_directory import AzureActiveDirectory from .certificate_description import CertificateDescription from .client_certificate_common_name import ClientCertificateCommonName from .client_certificate_thumbprint import ClientCertificateThumbprint from .cluster_version_details import ClusterVersionDetails + from .server_certificate_common_name import ServerCertificateCommonName + from .server_certificate_common_names import ServerCertificateCommonNames + from .diagnostics_storage_account_config import DiagnosticsStorageAccountConfig from .settings_parameter_description import SettingsParameterDescription from .settings_section_description import SettingsSectionDescription from .endpoint_range_description import EndpointRangeDescription from .node_type_description import NodeTypeDescription - from .diagnostics_storage_account_config import DiagnosticsStorageAccountConfig from .cluster_health_policy import ClusterHealthPolicy from .cluster_upgrade_delta_health_policy import ClusterUpgradeDeltaHealthPolicy from .cluster_upgrade_policy import ClusterUpgradePolicy @@ -116,59 +95,71 @@ from .cluster_code_versions_list_result import ClusterCodeVersionsListResult from .cluster_list_result import ClusterListResult from .cluster_update_parameters import ClusterUpdateParameters - from .error_model import ErrorModel, ErrorModelException from .operation_result import OperationResult - from .proxy_resource import ProxyResource from .resource import Resource - from .service_type_delta_health_policy import ServiceTypeDeltaHealthPolicy + from .error_model_error import ErrorModelError + from .error_model import ErrorModel, ErrorModelException + from .application_metric_description import ApplicationMetricDescription + from .application_resource import ApplicationResource + from .application_resource_list import ApplicationResourceList + from .arm_rolling_upgrade_monitoring_policy import ArmRollingUpgradeMonitoringPolicy + from .arm_service_type_health_policy import ArmServiceTypeHealthPolicy + from .arm_application_health_policy import ArmApplicationHealthPolicy + from .application_upgrade_policy import ApplicationUpgradePolicy + from .application_resource_update import ApplicationResourceUpdate + from .application_type_resource import ApplicationTypeResource + from .application_type_resource_list import ApplicationTypeResourceList + from .application_type_version_resource import ApplicationTypeVersionResource + from .application_type_version_resource_list import ApplicationTypeVersionResourceList + from .service_correlation_description import ServiceCorrelationDescription + from .named_partition_scheme_description import NamedPartitionSchemeDescription + from .partition_scheme_description import PartitionSchemeDescription + from .proxy_resource import ProxyResource + from .service_load_metric_description import ServiceLoadMetricDescription + from .service_placement_policy_description import ServicePlacementPolicyDescription + from .service_resource_properties import ServiceResourceProperties + from .service_resource import ServiceResource + from .service_resource_list import ServiceResourceList + from .service_resource_properties_base import ServiceResourcePropertiesBase + from .service_resource_update_properties import ServiceResourceUpdateProperties + from .service_resource_update import ServiceResourceUpdate + from .singleton_partition_scheme_description import SingletonPartitionSchemeDescription + from .stateful_service_properties import StatefulServiceProperties + from .stateful_service_update_properties import StatefulServiceUpdateProperties + from .stateless_service_properties import StatelessServiceProperties + from .stateless_service_update_properties import StatelessServiceUpdateProperties + from .uniform_int64_range_partition_scheme_description import UniformInt64RangePartitionSchemeDescription from .operation_result_paged import OperationResultPaged from .service_fabric_management_client_enums import ( ProvisioningState, + ArmUpgradeFailureAction, + ServiceCorrelationScheme, + MoveCost, + PartitionScheme, + ServiceKind, + ServiceLoadMetricWeight, + ServicePlacementPolicyType, + ArmServicePackageActivationMode, ) __all__ = [ + 'ServiceTypeDeltaHealthPolicy', + 'ApplicationDeltaHealthPolicy', 'ServiceTypeHealthPolicy', - 'ServiceTypeHealthPolicyMapItem', 'ApplicationHealthPolicy', - 'ApplicationMetricDescription', - 'ApplicationParameter', - 'ServiceCorrelationDescription', - 'ServiceLoadMetricDescription', - 'ServicePlacementPolicyDescription', - 'PartitionSchemeDescription', - 'NamedPartitionSchemeDescription', - 'SingletonPartitionSchemeDescription', - 'UniformInt64RangePartitionSchemeDescription', - 'ApplicationTypeResource', - 'ApplicationTypeResourceList', - 'VersionResource', - 'VersionResourceList', - 'ApplicationResource', - 'ApplicationResourceList', - 'RollingUpgradeMonitoringPolicy', - 'ApplicationUpgradePolicy', - 'ApplicationResourceUpdate', - 'ServiceProperties', - 'ServiceResource', - 'ServiceResourceList', - 'ServicePropertiesBase', - 'ServiceUpdateProperties', - 'ServiceResourceUpdate', - 'StatelessServiceProperties', - 'StatelessServiceUpdateProperties', - 'StatefulServiceProperties', - 'StatefulServiceUpdateProperties', 'AvailableOperationDisplay', 'AzureActiveDirectory', 'CertificateDescription', 'ClientCertificateCommonName', 'ClientCertificateThumbprint', 'ClusterVersionDetails', + 'ServerCertificateCommonName', + 'ServerCertificateCommonNames', + 'DiagnosticsStorageAccountConfig', 'SettingsParameterDescription', 'SettingsSectionDescription', 'EndpointRangeDescription', 'NodeTypeDescription', - 'DiagnosticsStorageAccountConfig', 'ClusterHealthPolicy', 'ClusterUpgradeDeltaHealthPolicy', 'ClusterUpgradePolicy', @@ -177,11 +168,48 @@ 'ClusterCodeVersionsListResult', 'ClusterListResult', 'ClusterUpdateParameters', - 'ErrorModel', 'ErrorModelException', 'OperationResult', - 'ProxyResource', 'Resource', - 'ServiceTypeDeltaHealthPolicy', + 'ErrorModelError', + 'ErrorModel', 'ErrorModelException', + 'ApplicationMetricDescription', + 'ApplicationResource', + 'ApplicationResourceList', + 'ArmRollingUpgradeMonitoringPolicy', + 'ArmServiceTypeHealthPolicy', + 'ArmApplicationHealthPolicy', + 'ApplicationUpgradePolicy', + 'ApplicationResourceUpdate', + 'ApplicationTypeResource', + 'ApplicationTypeResourceList', + 'ApplicationTypeVersionResource', + 'ApplicationTypeVersionResourceList', + 'ServiceCorrelationDescription', + 'NamedPartitionSchemeDescription', + 'PartitionSchemeDescription', + 'ProxyResource', + 'ServiceLoadMetricDescription', + 'ServicePlacementPolicyDescription', + 'ServiceResourceProperties', + 'ServiceResource', + 'ServiceResourceList', + 'ServiceResourcePropertiesBase', + 'ServiceResourceUpdateProperties', + 'ServiceResourceUpdate', + 'SingletonPartitionSchemeDescription', + 'StatefulServiceProperties', + 'StatefulServiceUpdateProperties', + 'StatelessServiceProperties', + 'StatelessServiceUpdateProperties', + 'UniformInt64RangePartitionSchemeDescription', 'OperationResultPaged', 'ProvisioningState', + 'ArmUpgradeFailureAction', + 'ServiceCorrelationScheme', + 'MoveCost', + 'PartitionScheme', + 'ServiceKind', + 'ServiceLoadMetricWeight', + 'ServicePlacementPolicyType', + 'ArmServicePackageActivationMode', ] diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_delta_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_delta_health_policy.py new file mode 100644 index 000000000000..92c0e09692d0 --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_delta_health_policy.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationDeltaHealthPolicy(Model): + """Defines a delta health policy used to evaluate the health of an application + or one of its child entities when upgrading the cluster. + . + + :param default_service_type_delta_health_policy: The delta health policy + used by default to evaluate the health of a service type when upgrading + the cluster. + :type default_service_type_delta_health_policy: + ~azure.mgmt.servicefabric.models.ServiceTypeDeltaHealthPolicy + :param service_type_delta_health_policies: The map with service type delta + health policy per service type name. The map is empty by default. + :type service_type_delta_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ServiceTypeDeltaHealthPolicy] + """ + + _attribute_map = { + 'default_service_type_delta_health_policy': {'key': 'defaultServiceTypeDeltaHealthPolicy', 'type': 'ServiceTypeDeltaHealthPolicy'}, + 'service_type_delta_health_policies': {'key': 'serviceTypeDeltaHealthPolicies', 'type': '{ServiceTypeDeltaHealthPolicy}'}, + } + + def __init__(self, **kwargs): + super(ApplicationDeltaHealthPolicy, self).__init__(**kwargs) + self.default_service_type_delta_health_policy = kwargs.get('default_service_type_delta_health_policy', None) + self.service_type_delta_health_policies = kwargs.get('service_type_delta_health_policies', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_delta_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_delta_health_policy_py3.py new file mode 100644 index 000000000000..d12178625499 --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_delta_health_policy_py3.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationDeltaHealthPolicy(Model): + """Defines a delta health policy used to evaluate the health of an application + or one of its child entities when upgrading the cluster. + . + + :param default_service_type_delta_health_policy: The delta health policy + used by default to evaluate the health of a service type when upgrading + the cluster. + :type default_service_type_delta_health_policy: + ~azure.mgmt.servicefabric.models.ServiceTypeDeltaHealthPolicy + :param service_type_delta_health_policies: The map with service type delta + health policy per service type name. The map is empty by default. + :type service_type_delta_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ServiceTypeDeltaHealthPolicy] + """ + + _attribute_map = { + 'default_service_type_delta_health_policy': {'key': 'defaultServiceTypeDeltaHealthPolicy', 'type': 'ServiceTypeDeltaHealthPolicy'}, + 'service_type_delta_health_policies': {'key': 'serviceTypeDeltaHealthPolicies', 'type': '{ServiceTypeDeltaHealthPolicy}'}, + } + + def __init__(self, *, default_service_type_delta_health_policy=None, service_type_delta_health_policies=None, **kwargs) -> None: + super(ApplicationDeltaHealthPolicy, self).__init__(**kwargs) + self.default_service_type_delta_health_policy = default_service_type_delta_health_policy + self.service_type_delta_health_policies = service_type_delta_health_policies diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy.py index 1f12ad88cd2a..155d5d325b03 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy.py @@ -17,40 +17,22 @@ class ApplicationHealthPolicy(Model): one of its children entities. . - :param consider_warning_as_error: Indicates whether warnings are treated - with the same severity as errors. Default value: False . - :type consider_warning_as_error: bool - :param max_percent_unhealthy_deployed_applications: The maximum allowed - percentage of unhealthy deployed applications. Allowed values are Byte - values from zero to 100. - The percentage represents the maximum tolerated percentage of deployed - applications that can be unhealthy before the application is considered in - error. - This is calculated by dividing the number of unhealthy deployed - applications over the number of nodes where the application is currently - deployed on in the cluster. - The computation rounds up to tolerate one failure on small numbers of - nodes. Default percentage is zero. - . Default value: 0 . - :type max_percent_unhealthy_deployed_applications: int - :param default_service_type_health_policy: + :param default_service_type_health_policy: The health policy used by + default to evaluate the health of a service type. :type default_service_type_health_policy: ~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicy - :param service_type_health_policy_map: - :type service_type_health_policy_map: - list[~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicyMapItem] + :param service_type_health_policies: The map with service type health + policy per service type name. The map is empty by default. + :type service_type_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicy] """ _attribute_map = { - 'consider_warning_as_error': {'key': 'ConsiderWarningAsError', 'type': 'bool'}, - 'max_percent_unhealthy_deployed_applications': {'key': 'MaxPercentUnhealthyDeployedApplications', 'type': 'int'}, - 'default_service_type_health_policy': {'key': 'DefaultServiceTypeHealthPolicy', 'type': 'ServiceTypeHealthPolicy'}, - 'service_type_health_policy_map': {'key': 'ServiceTypeHealthPolicyMap', 'type': '[ServiceTypeHealthPolicyMapItem]'}, + 'default_service_type_health_policy': {'key': 'defaultServiceTypeHealthPolicy', 'type': 'ServiceTypeHealthPolicy'}, + 'service_type_health_policies': {'key': 'serviceTypeHealthPolicies', 'type': '{ServiceTypeHealthPolicy}'}, } def __init__(self, **kwargs): super(ApplicationHealthPolicy, self).__init__(**kwargs) - self.consider_warning_as_error = kwargs.get('consider_warning_as_error', False) - self.max_percent_unhealthy_deployed_applications = kwargs.get('max_percent_unhealthy_deployed_applications', 0) self.default_service_type_health_policy = kwargs.get('default_service_type_health_policy', None) - self.service_type_health_policy_map = kwargs.get('service_type_health_policy_map', None) + self.service_type_health_policies = kwargs.get('service_type_health_policies', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy_py3.py index 5cf37017a5d5..6f2fd6a2411c 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy_py3.py @@ -17,40 +17,22 @@ class ApplicationHealthPolicy(Model): one of its children entities. . - :param consider_warning_as_error: Indicates whether warnings are treated - with the same severity as errors. Default value: False . - :type consider_warning_as_error: bool - :param max_percent_unhealthy_deployed_applications: The maximum allowed - percentage of unhealthy deployed applications. Allowed values are Byte - values from zero to 100. - The percentage represents the maximum tolerated percentage of deployed - applications that can be unhealthy before the application is considered in - error. - This is calculated by dividing the number of unhealthy deployed - applications over the number of nodes where the application is currently - deployed on in the cluster. - The computation rounds up to tolerate one failure on small numbers of - nodes. Default percentage is zero. - . Default value: 0 . - :type max_percent_unhealthy_deployed_applications: int - :param default_service_type_health_policy: + :param default_service_type_health_policy: The health policy used by + default to evaluate the health of a service type. :type default_service_type_health_policy: ~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicy - :param service_type_health_policy_map: - :type service_type_health_policy_map: - list[~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicyMapItem] + :param service_type_health_policies: The map with service type health + policy per service type name. The map is empty by default. + :type service_type_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicy] """ _attribute_map = { - 'consider_warning_as_error': {'key': 'ConsiderWarningAsError', 'type': 'bool'}, - 'max_percent_unhealthy_deployed_applications': {'key': 'MaxPercentUnhealthyDeployedApplications', 'type': 'int'}, - 'default_service_type_health_policy': {'key': 'DefaultServiceTypeHealthPolicy', 'type': 'ServiceTypeHealthPolicy'}, - 'service_type_health_policy_map': {'key': 'ServiceTypeHealthPolicyMap', 'type': '[ServiceTypeHealthPolicyMapItem]'}, + 'default_service_type_health_policy': {'key': 'defaultServiceTypeHealthPolicy', 'type': 'ServiceTypeHealthPolicy'}, + 'service_type_health_policies': {'key': 'serviceTypeHealthPolicies', 'type': '{ServiceTypeHealthPolicy}'}, } - def __init__(self, *, consider_warning_as_error: bool=False, max_percent_unhealthy_deployed_applications: int=0, default_service_type_health_policy=None, service_type_health_policy_map=None, **kwargs) -> None: + def __init__(self, *, default_service_type_health_policy=None, service_type_health_policies=None, **kwargs) -> None: super(ApplicationHealthPolicy, self).__init__(**kwargs) - self.consider_warning_as_error = consider_warning_as_error - self.max_percent_unhealthy_deployed_applications = max_percent_unhealthy_deployed_applications self.default_service_type_health_policy = default_service_type_health_policy - self.service_type_health_policy_map = service_type_health_policy_map + self.service_type_health_policies = service_type_health_policies diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description.py index e761c2c9e572..55a7dcb9cb1b 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description.py @@ -57,10 +57,10 @@ class ApplicationMetricDescription(Model): """ _attribute_map = { - 'name': {'key': 'Name', 'type': 'str'}, - 'maximum_capacity': {'key': 'MaximumCapacity', 'type': 'long'}, - 'reservation_capacity': {'key': 'ReservationCapacity', 'type': 'long'}, - 'total_application_capacity': {'key': 'TotalApplicationCapacity', 'type': 'long'}, + 'name': {'key': 'name', 'type': 'str'}, + 'maximum_capacity': {'key': 'maximumCapacity', 'type': 'long'}, + 'reservation_capacity': {'key': 'reservationCapacity', 'type': 'long'}, + 'total_application_capacity': {'key': 'totalApplicationCapacity', 'type': 'long'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description_py3.py index f4510d8c55d4..5ef7898ba703 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_metric_description_py3.py @@ -57,10 +57,10 @@ class ApplicationMetricDescription(Model): """ _attribute_map = { - 'name': {'key': 'Name', 'type': 'str'}, - 'maximum_capacity': {'key': 'MaximumCapacity', 'type': 'long'}, - 'reservation_capacity': {'key': 'ReservationCapacity', 'type': 'long'}, - 'total_application_capacity': {'key': 'TotalApplicationCapacity', 'type': 'long'}, + 'name': {'key': 'name', 'type': 'str'}, + 'maximum_capacity': {'key': 'maximumCapacity', 'type': 'long'}, + 'reservation_capacity': {'key': 'reservationCapacity', 'type': 'long'}, + 'total_application_capacity': {'key': 'totalApplicationCapacity', 'type': 'long'}, } def __init__(self, *, name: str=None, maximum_capacity: int=None, reservation_capacity: int=None, total_application_capacity: int=None, **kwargs) -> None: diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_parameter.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_parameter.py deleted file mode 100644 index 602c2e6560d4..000000000000 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_parameter.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ApplicationParameter(Model): - """Describes an application parameter override to be applied when creating or - upgrading an application. - - All required parameters must be populated in order to send to Azure. - - :param key: Required. The name of the parameter. - :type key: str - :param value: Required. The value of the parameter. - :type value: str - """ - - _validation = { - 'key': {'required': True}, - 'value': {'required': True}, - } - - _attribute_map = { - 'key': {'key': 'Key', 'type': 'str'}, - 'value': {'key': 'Value', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(ApplicationParameter, self).__init__(**kwargs) - self.key = kwargs.get('key', None) - self.value = kwargs.get('value', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_parameter_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_parameter_py3.py deleted file mode 100644 index d6d910dfd7f9..000000000000 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_parameter_py3.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ApplicationParameter(Model): - """Describes an application parameter override to be applied when creating or - upgrading an application. - - All required parameters must be populated in order to send to Azure. - - :param key: Required. The name of the parameter. - :type key: str - :param value: Required. The value of the parameter. - :type value: str - """ - - _validation = { - 'key': {'required': True}, - 'value': {'required': True}, - } - - _attribute_map = { - 'key': {'key': 'Key', 'type': 'str'}, - 'value': {'key': 'Value', 'type': 'str'}, - } - - def __init__(self, *, key: str, value: str, **kwargs) -> None: - super(ApplicationParameter, self).__init__(**kwargs) - self.key = key - self.value = value diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource.py index f70da99aaeb1..717f9d041259 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource.py @@ -18,22 +18,26 @@ class ApplicationResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str - :param type_version: + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str + :param type_version: The version of the application type as defined in the + application manifest. :type type_version: str - :param parameters: - :type parameters: - list[~azure.mgmt.servicefabric.models.ApplicationParameter] - :param upgrade_policy: + :param parameters: List of application parameters with overridden values + from their default values specified in the application manifest. + :type parameters: dict[str, str] + :param upgrade_policy: Describes the policy for a monitored application + upgrade. :type upgrade_policy: ~azure.mgmt.servicefabric.models.ApplicationUpgradePolicy :param minimum_nodes: The minimum number of nodes where Service Fabric @@ -49,15 +53,17 @@ class ApplicationResource(ProxyResource): nodes. By default, the value of this property is zero and it means that the services can be placed on any node. Default value: 0 . :type maximum_nodes: long - :param remove_application_capacity: The version of the application type + :param remove_application_capacity: Remove the current application + capacity settings. :type remove_application_capacity: bool - :param metrics: + :param metrics: List of application capacity metric description. :type metrics: list[~azure.mgmt.servicefabric.models.ApplicationMetricDescription] :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str - :param type_name: + :param type_name: The application type name as defined in the application + manifest. :type type_name: str """ @@ -65,7 +71,7 @@ class ApplicationResource(ProxyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'minimum_nodes': {'minimum': 0}, 'maximum_nodes': {'minimum': 0}, 'provisioning_state': {'readonly': True}, @@ -76,8 +82,10 @@ class ApplicationResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'type_version': {'key': 'properties.typeVersion', 'type': 'str'}, - 'parameters': {'key': 'properties.parameters', 'type': '[ApplicationParameter]'}, + 'parameters': {'key': 'properties.parameters', 'type': '{str}'}, 'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'ApplicationUpgradePolicy'}, 'minimum_nodes': {'key': 'properties.minimumNodes', 'type': 'long'}, 'maximum_nodes': {'key': 'properties.maximumNodes', 'type': 'long'}, diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list.py index bc646a4f5629..6bce9a2e85e6 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list.py @@ -15,14 +15,26 @@ class ApplicationResourceList(Model): """The list of application resources. + Variables are only populated by the server, and will be ignored when + sending a request. + :param value: :type value: list[~azure.mgmt.servicefabric.models.ApplicationResource] + :ivar next_link: URL to get the next set of application list results if + there are any. + :vartype next_link: str """ + _validation = { + 'next_link': {'readonly': True}, + } + _attribute_map = { 'value': {'key': 'value', 'type': '[ApplicationResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, } def __init__(self, **kwargs): super(ApplicationResourceList, self).__init__(**kwargs) self.value = kwargs.get('value', None) + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list_py3.py index e2be550f5ecc..61cb59fcf08c 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_list_py3.py @@ -15,14 +15,26 @@ class ApplicationResourceList(Model): """The list of application resources. + Variables are only populated by the server, and will be ignored when + sending a request. + :param value: :type value: list[~azure.mgmt.servicefabric.models.ApplicationResource] + :ivar next_link: URL to get the next set of application list results if + there are any. + :vartype next_link: str """ + _validation = { + 'next_link': {'readonly': True}, + } + _attribute_map = { 'value': {'key': 'value', 'type': '[ApplicationResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, } def __init__(self, *, value=None, **kwargs) -> None: super(ApplicationResourceList, self).__init__(**kwargs) self.value = value + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_py3.py index c9f5bb63af7d..a89325ad256e 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_py3.py @@ -18,22 +18,26 @@ class ApplicationResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str - :param type_version: + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str + :param type_version: The version of the application type as defined in the + application manifest. :type type_version: str - :param parameters: - :type parameters: - list[~azure.mgmt.servicefabric.models.ApplicationParameter] - :param upgrade_policy: + :param parameters: List of application parameters with overridden values + from their default values specified in the application manifest. + :type parameters: dict[str, str] + :param upgrade_policy: Describes the policy for a monitored application + upgrade. :type upgrade_policy: ~azure.mgmt.servicefabric.models.ApplicationUpgradePolicy :param minimum_nodes: The minimum number of nodes where Service Fabric @@ -49,15 +53,17 @@ class ApplicationResource(ProxyResource): nodes. By default, the value of this property is zero and it means that the services can be placed on any node. Default value: 0 . :type maximum_nodes: long - :param remove_application_capacity: The version of the application type + :param remove_application_capacity: Remove the current application + capacity settings. :type remove_application_capacity: bool - :param metrics: + :param metrics: List of application capacity metric description. :type metrics: list[~azure.mgmt.servicefabric.models.ApplicationMetricDescription] :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str - :param type_name: + :param type_name: The application type name as defined in the application + manifest. :type type_name: str """ @@ -65,7 +71,7 @@ class ApplicationResource(ProxyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'minimum_nodes': {'minimum': 0}, 'maximum_nodes': {'minimum': 0}, 'provisioning_state': {'readonly': True}, @@ -76,8 +82,10 @@ class ApplicationResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'type_version': {'key': 'properties.typeVersion', 'type': 'str'}, - 'parameters': {'key': 'properties.parameters', 'type': '[ApplicationParameter]'}, + 'parameters': {'key': 'properties.parameters', 'type': '{str}'}, 'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'ApplicationUpgradePolicy'}, 'minimum_nodes': {'key': 'properties.minimumNodes', 'type': 'long'}, 'maximum_nodes': {'key': 'properties.maximumNodes', 'type': 'long'}, @@ -87,8 +95,8 @@ class ApplicationResource(ProxyResource): 'type_name': {'key': 'properties.typeName', 'type': 'str'}, } - def __init__(self, *, location: str, type_version: str=None, parameters=None, upgrade_policy=None, minimum_nodes: int=None, maximum_nodes: int=0, remove_application_capacity: bool=None, metrics=None, type_name: str=None, **kwargs) -> None: - super(ApplicationResource, self).__init__(location=location, **kwargs) + def __init__(self, *, location: str=None, tags=None, type_version: str=None, parameters=None, upgrade_policy=None, minimum_nodes: int=None, maximum_nodes: int=0, remove_application_capacity: bool=None, metrics=None, type_name: str=None, **kwargs) -> None: + super(ApplicationResource, self).__init__(location=location, tags=tags, **kwargs) self.type_version = type_version self.parameters = parameters self.upgrade_policy = upgrade_policy diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update.py index 67f7b66545f7..65c5956e192e 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update.py @@ -18,22 +18,26 @@ class ApplicationResourceUpdate(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str - :param type_version: + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str + :param type_version: The version of the application type as defined in the + application manifest. :type type_version: str - :param parameters: - :type parameters: - list[~azure.mgmt.servicefabric.models.ApplicationParameter] - :param upgrade_policy: + :param parameters: List of application parameters with overridden values + from their default values specified in the application manifest. + :type parameters: dict[str, str] + :param upgrade_policy: Describes the policy for a monitored application + upgrade. :type upgrade_policy: ~azure.mgmt.servicefabric.models.ApplicationUpgradePolicy :param minimum_nodes: The minimum number of nodes where Service Fabric @@ -49,9 +53,10 @@ class ApplicationResourceUpdate(ProxyResource): nodes. By default, the value of this property is zero and it means that the services can be placed on any node. Default value: 0 . :type maximum_nodes: long - :param remove_application_capacity: The version of the application type + :param remove_application_capacity: Remove the current application + capacity settings. :type remove_application_capacity: bool - :param metrics: + :param metrics: List of application capacity metric description. :type metrics: list[~azure.mgmt.servicefabric.models.ApplicationMetricDescription] """ @@ -60,7 +65,7 @@ class ApplicationResourceUpdate(ProxyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'minimum_nodes': {'minimum': 0}, 'maximum_nodes': {'minimum': 0}, } @@ -70,8 +75,10 @@ class ApplicationResourceUpdate(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'type_version': {'key': 'properties.typeVersion', 'type': 'str'}, - 'parameters': {'key': 'properties.parameters', 'type': '[ApplicationParameter]'}, + 'parameters': {'key': 'properties.parameters', 'type': '{str}'}, 'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'ApplicationUpgradePolicy'}, 'minimum_nodes': {'key': 'properties.minimumNodes', 'type': 'long'}, 'maximum_nodes': {'key': 'properties.maximumNodes', 'type': 'long'}, diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update_py3.py index ae683a36b118..b0c5d872ae67 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_resource_update_py3.py @@ -18,22 +18,26 @@ class ApplicationResourceUpdate(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str - :param type_version: + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str + :param type_version: The version of the application type as defined in the + application manifest. :type type_version: str - :param parameters: - :type parameters: - list[~azure.mgmt.servicefabric.models.ApplicationParameter] - :param upgrade_policy: + :param parameters: List of application parameters with overridden values + from their default values specified in the application manifest. + :type parameters: dict[str, str] + :param upgrade_policy: Describes the policy for a monitored application + upgrade. :type upgrade_policy: ~azure.mgmt.servicefabric.models.ApplicationUpgradePolicy :param minimum_nodes: The minimum number of nodes where Service Fabric @@ -49,9 +53,10 @@ class ApplicationResourceUpdate(ProxyResource): nodes. By default, the value of this property is zero and it means that the services can be placed on any node. Default value: 0 . :type maximum_nodes: long - :param remove_application_capacity: The version of the application type + :param remove_application_capacity: Remove the current application + capacity settings. :type remove_application_capacity: bool - :param metrics: + :param metrics: List of application capacity metric description. :type metrics: list[~azure.mgmt.servicefabric.models.ApplicationMetricDescription] """ @@ -60,7 +65,7 @@ class ApplicationResourceUpdate(ProxyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'minimum_nodes': {'minimum': 0}, 'maximum_nodes': {'minimum': 0}, } @@ -70,8 +75,10 @@ class ApplicationResourceUpdate(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'type_version': {'key': 'properties.typeVersion', 'type': 'str'}, - 'parameters': {'key': 'properties.parameters', 'type': '[ApplicationParameter]'}, + 'parameters': {'key': 'properties.parameters', 'type': '{str}'}, 'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'ApplicationUpgradePolicy'}, 'minimum_nodes': {'key': 'properties.minimumNodes', 'type': 'long'}, 'maximum_nodes': {'key': 'properties.maximumNodes', 'type': 'long'}, @@ -79,8 +86,8 @@ class ApplicationResourceUpdate(ProxyResource): 'metrics': {'key': 'properties.metrics', 'type': '[ApplicationMetricDescription]'}, } - def __init__(self, *, location: str, type_version: str=None, parameters=None, upgrade_policy=None, minimum_nodes: int=None, maximum_nodes: int=0, remove_application_capacity: bool=None, metrics=None, **kwargs) -> None: - super(ApplicationResourceUpdate, self).__init__(location=location, **kwargs) + def __init__(self, *, location: str=None, tags=None, type_version: str=None, parameters=None, upgrade_policy=None, minimum_nodes: int=None, maximum_nodes: int=0, remove_application_capacity: bool=None, metrics=None, **kwargs) -> None: + super(ApplicationResourceUpdate, self).__init__(location=location, tags=tags, **kwargs) self.type_version = type_version self.parameters = parameters self.upgrade_policy = upgrade_policy diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource.py index e6d2eec83ac9..67500bec534f 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource.py @@ -18,16 +18,18 @@ class ApplicationTypeResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response. :vartype provisioning_state: str @@ -37,7 +39,7 @@ class ApplicationTypeResource(ProxyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'provisioning_state': {'readonly': True}, } @@ -46,6 +48,8 @@ class ApplicationTypeResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, } diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list.py index 4dcf560816aa..dfd7af144079 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list.py @@ -15,15 +15,27 @@ class ApplicationTypeResourceList(Model): """The list of application type names. + Variables are only populated by the server, and will be ignored when + sending a request. + :param value: :type value: list[~azure.mgmt.servicefabric.models.ApplicationTypeResource] + :ivar next_link: URL to get the next set of application type list results + if there are any. + :vartype next_link: str """ + _validation = { + 'next_link': {'readonly': True}, + } + _attribute_map = { 'value': {'key': 'value', 'type': '[ApplicationTypeResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, } def __init__(self, **kwargs): super(ApplicationTypeResourceList, self).__init__(**kwargs) self.value = kwargs.get('value', None) + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list_py3.py index 5c8ff2c19801..30e7b7eff571 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_list_py3.py @@ -15,15 +15,27 @@ class ApplicationTypeResourceList(Model): """The list of application type names. + Variables are only populated by the server, and will be ignored when + sending a request. + :param value: :type value: list[~azure.mgmt.servicefabric.models.ApplicationTypeResource] + :ivar next_link: URL to get the next set of application type list results + if there are any. + :vartype next_link: str """ + _validation = { + 'next_link': {'readonly': True}, + } + _attribute_map = { 'value': {'key': 'value', 'type': '[ApplicationTypeResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, } def __init__(self, *, value=None, **kwargs) -> None: super(ApplicationTypeResourceList, self).__init__(**kwargs) self.value = value + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_py3.py index 7cf082ee4085..efcec3b14f62 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_resource_py3.py @@ -18,16 +18,18 @@ class ApplicationTypeResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response. :vartype provisioning_state: str @@ -37,7 +39,7 @@ class ApplicationTypeResource(ProxyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'provisioning_state': {'readonly': True}, } @@ -46,9 +48,11 @@ class ApplicationTypeResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, } - def __init__(self, *, location: str, **kwargs) -> None: - super(ApplicationTypeResource, self).__init__(location=location, **kwargs) + def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: + super(ApplicationTypeResource, self).__init__(location=location, tags=tags, **kwargs) self.provisioning_state = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource.py similarity index 71% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource.py index e4e411ad361f..6fd3bb35b2d0 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource.py @@ -12,37 +12,42 @@ from .proxy_resource import ProxyResource -class VersionResource(ProxyResource): - """A version resource for the specified application type name. +class ApplicationTypeVersionResource(ProxyResource): + """An application type version resource for the specified application type + name resource. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param app_package_url: Required. The URL to the application package :type app_package_url: str - :ivar default_parameter_list: - :vartype default_parameter_list: - list[~azure.mgmt.servicefabric.models.ApplicationParameter] + :ivar default_parameter_list: List of application type parameters that can + be overridden when creating or updating the application. + :vartype default_parameter_list: dict[str, str] """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'app_package_url': {'required': True}, 'default_parameter_list': {'readonly': True}, @@ -53,13 +58,15 @@ class VersionResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'app_package_url': {'key': 'properties.appPackageUrl', 'type': 'str'}, - 'default_parameter_list': {'key': 'properties.defaultParameterList', 'type': '[ApplicationParameter]'}, + 'default_parameter_list': {'key': 'properties.defaultParameterList', 'type': '{str}'}, } def __init__(self, **kwargs): - super(VersionResource, self).__init__(**kwargs) + super(ApplicationTypeVersionResource, self).__init__(**kwargs) self.provisioning_state = None self.app_package_url = kwargs.get('app_package_url', None) self.default_parameter_list = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_list.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_list.py new file mode 100644 index 000000000000..a472b5436b9a --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_list.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationTypeVersionResourceList(Model): + """The list of application type version resources for the specified + application type name resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param value: + :type value: + list[~azure.mgmt.servicefabric.models.ApplicationTypeVersionResource] + :ivar next_link: URL to get the next set of application type version list + results if there are any. + :vartype next_link: str + """ + + _validation = { + 'next_link': {'readonly': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[ApplicationTypeVersionResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ApplicationTypeVersionResourceList, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_list_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_list_py3.py new file mode 100644 index 000000000000..6b867211fd7d --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_list_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationTypeVersionResourceList(Model): + """The list of application type version resources for the specified + application type name resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param value: + :type value: + list[~azure.mgmt.servicefabric.models.ApplicationTypeVersionResource] + :ivar next_link: URL to get the next set of application type version list + results if there are any. + :vartype next_link: str + """ + + _validation = { + 'next_link': {'readonly': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[ApplicationTypeVersionResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__(self, *, value=None, **kwargs) -> None: + super(ApplicationTypeVersionResourceList, self).__init__(**kwargs) + self.value = value + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_py3.py similarity index 68% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_py3.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_py3.py index 5ede39ee2c15..5bf6ec7bcde8 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_type_version_resource_py3.py @@ -12,37 +12,42 @@ from .proxy_resource_py3 import ProxyResource -class VersionResource(ProxyResource): - """A version resource for the specified application type name. +class ApplicationTypeVersionResource(ProxyResource): + """An application type version resource for the specified application type + name resource. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param app_package_url: Required. The URL to the application package :type app_package_url: str - :ivar default_parameter_list: - :vartype default_parameter_list: - list[~azure.mgmt.servicefabric.models.ApplicationParameter] + :ivar default_parameter_list: List of application type parameters that can + be overridden when creating or updating the application. + :vartype default_parameter_list: dict[str, str] """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'app_package_url': {'required': True}, 'default_parameter_list': {'readonly': True}, @@ -53,13 +58,15 @@ class VersionResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'app_package_url': {'key': 'properties.appPackageUrl', 'type': 'str'}, - 'default_parameter_list': {'key': 'properties.defaultParameterList', 'type': '[ApplicationParameter]'}, + 'default_parameter_list': {'key': 'properties.defaultParameterList', 'type': '{str}'}, } - def __init__(self, *, location: str, app_package_url: str, **kwargs) -> None: - super(VersionResource, self).__init__(location=location, **kwargs) + def __init__(self, *, app_package_url: str, location: str=None, tags=None, **kwargs) -> None: + super(ApplicationTypeVersionResource, self).__init__(location=location, tags=tags, **kwargs) self.provisioning_state = None self.app_package_url = app_package_url self.default_parameter_list = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy.py index 5cf549363a52..696d69ac94f7 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy.py @@ -15,23 +15,32 @@ class ApplicationUpgradePolicy(Model): """Describes the policy for a monitored application upgrade. - :param upgrade_replica_set_check_timeout: - :type upgrade_replica_set_check_timeout: long - :param force_restart: + :param upgrade_replica_set_check_timeout: The maximum amount of time to + block processing of an upgrade domain and prevent loss of availability + when there are unexpected issues. When this timeout expires, processing of + the upgrade domain will proceed regardless of availability loss issues. + The timeout is reset at the start of each upgrade domain. Valid values are + between 0 and 42949672925 inclusive. (unsigned 32-bit integer). + :type upgrade_replica_set_check_timeout: str + :param force_restart: If true, then processes are forcefully restarted + during upgrade even when the code version has not changed (the upgrade + only changes configuration or data). :type force_restart: bool - :param rolling_upgrade_monitoring_policy: + :param rolling_upgrade_monitoring_policy: The policy used for monitoring + the application upgrade :type rolling_upgrade_monitoring_policy: - ~azure.mgmt.servicefabric.models.RollingUpgradeMonitoringPolicy - :param application_health_policy: + ~azure.mgmt.servicefabric.models.ArmRollingUpgradeMonitoringPolicy + :param application_health_policy: Defines a health policy used to evaluate + the health of an application or one of its children entities. :type application_health_policy: - ~azure.mgmt.servicefabric.models.ApplicationHealthPolicy + ~azure.mgmt.servicefabric.models.ArmApplicationHealthPolicy """ _attribute_map = { - 'upgrade_replica_set_check_timeout': {'key': 'upgradeReplicaSetCheckTimeout', 'type': 'long'}, + 'upgrade_replica_set_check_timeout': {'key': 'upgradeReplicaSetCheckTimeout', 'type': 'str'}, 'force_restart': {'key': 'forceRestart', 'type': 'bool'}, - 'rolling_upgrade_monitoring_policy': {'key': 'rollingUpgradeMonitoringPolicy', 'type': 'RollingUpgradeMonitoringPolicy'}, - 'application_health_policy': {'key': 'applicationHealthPolicy', 'type': 'ApplicationHealthPolicy'}, + 'rolling_upgrade_monitoring_policy': {'key': 'rollingUpgradeMonitoringPolicy', 'type': 'ArmRollingUpgradeMonitoringPolicy'}, + 'application_health_policy': {'key': 'applicationHealthPolicy', 'type': 'ArmApplicationHealthPolicy'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy_py3.py index cf48bf95a8f9..97d06aded044 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_upgrade_policy_py3.py @@ -15,26 +15,35 @@ class ApplicationUpgradePolicy(Model): """Describes the policy for a monitored application upgrade. - :param upgrade_replica_set_check_timeout: - :type upgrade_replica_set_check_timeout: long - :param force_restart: + :param upgrade_replica_set_check_timeout: The maximum amount of time to + block processing of an upgrade domain and prevent loss of availability + when there are unexpected issues. When this timeout expires, processing of + the upgrade domain will proceed regardless of availability loss issues. + The timeout is reset at the start of each upgrade domain. Valid values are + between 0 and 42949672925 inclusive. (unsigned 32-bit integer). + :type upgrade_replica_set_check_timeout: str + :param force_restart: If true, then processes are forcefully restarted + during upgrade even when the code version has not changed (the upgrade + only changes configuration or data). :type force_restart: bool - :param rolling_upgrade_monitoring_policy: + :param rolling_upgrade_monitoring_policy: The policy used for monitoring + the application upgrade :type rolling_upgrade_monitoring_policy: - ~azure.mgmt.servicefabric.models.RollingUpgradeMonitoringPolicy - :param application_health_policy: + ~azure.mgmt.servicefabric.models.ArmRollingUpgradeMonitoringPolicy + :param application_health_policy: Defines a health policy used to evaluate + the health of an application or one of its children entities. :type application_health_policy: - ~azure.mgmt.servicefabric.models.ApplicationHealthPolicy + ~azure.mgmt.servicefabric.models.ArmApplicationHealthPolicy """ _attribute_map = { - 'upgrade_replica_set_check_timeout': {'key': 'upgradeReplicaSetCheckTimeout', 'type': 'long'}, + 'upgrade_replica_set_check_timeout': {'key': 'upgradeReplicaSetCheckTimeout', 'type': 'str'}, 'force_restart': {'key': 'forceRestart', 'type': 'bool'}, - 'rolling_upgrade_monitoring_policy': {'key': 'rollingUpgradeMonitoringPolicy', 'type': 'RollingUpgradeMonitoringPolicy'}, - 'application_health_policy': {'key': 'applicationHealthPolicy', 'type': 'ApplicationHealthPolicy'}, + 'rolling_upgrade_monitoring_policy': {'key': 'rollingUpgradeMonitoringPolicy', 'type': 'ArmRollingUpgradeMonitoringPolicy'}, + 'application_health_policy': {'key': 'applicationHealthPolicy', 'type': 'ArmApplicationHealthPolicy'}, } - def __init__(self, *, upgrade_replica_set_check_timeout: int=None, force_restart: bool=None, rolling_upgrade_monitoring_policy=None, application_health_policy=None, **kwargs) -> None: + def __init__(self, *, upgrade_replica_set_check_timeout: str=None, force_restart: bool=None, rolling_upgrade_monitoring_policy=None, application_health_policy=None, **kwargs) -> None: super(ApplicationUpgradePolicy, self).__init__(**kwargs) self.upgrade_replica_set_check_timeout = upgrade_replica_set_check_timeout self.force_restart = force_restart diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_application_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_application_health_policy.py new file mode 100644 index 000000000000..d0285335a62a --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_application_health_policy.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ArmApplicationHealthPolicy(Model): + """Defines a health policy used to evaluate the health of an application or + one of its children entities. + . + + :param consider_warning_as_error: Indicates whether warnings are treated + with the same severity as errors. Default value: False . + :type consider_warning_as_error: bool + :param max_percent_unhealthy_deployed_applications: The maximum allowed + percentage of unhealthy deployed applications. Allowed values are Byte + values from zero to 100. + The percentage represents the maximum tolerated percentage of deployed + applications that can be unhealthy before the application is considered in + error. + This is calculated by dividing the number of unhealthy deployed + applications over the number of nodes where the application is currently + deployed on in the cluster. + The computation rounds up to tolerate one failure on small numbers of + nodes. Default percentage is zero. + . Default value: 0 . + :type max_percent_unhealthy_deployed_applications: int + :param default_service_type_health_policy: The health policy used by + default to evaluate the health of a service type. + :type default_service_type_health_policy: + ~azure.mgmt.servicefabric.models.ArmServiceTypeHealthPolicy + :param service_type_health_policy_map: The map with service type health + policy per service type name. The map is empty by default. + :type service_type_health_policy_map: dict[str, + ~azure.mgmt.servicefabric.models.ArmServiceTypeHealthPolicy] + """ + + _attribute_map = { + 'consider_warning_as_error': {'key': 'considerWarningAsError', 'type': 'bool'}, + 'max_percent_unhealthy_deployed_applications': {'key': 'maxPercentUnhealthyDeployedApplications', 'type': 'int'}, + 'default_service_type_health_policy': {'key': 'defaultServiceTypeHealthPolicy', 'type': 'ArmServiceTypeHealthPolicy'}, + 'service_type_health_policy_map': {'key': 'serviceTypeHealthPolicyMap', 'type': '{ArmServiceTypeHealthPolicy}'}, + } + + def __init__(self, **kwargs): + super(ArmApplicationHealthPolicy, self).__init__(**kwargs) + self.consider_warning_as_error = kwargs.get('consider_warning_as_error', False) + self.max_percent_unhealthy_deployed_applications = kwargs.get('max_percent_unhealthy_deployed_applications', 0) + self.default_service_type_health_policy = kwargs.get('default_service_type_health_policy', None) + self.service_type_health_policy_map = kwargs.get('service_type_health_policy_map', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_application_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_application_health_policy_py3.py new file mode 100644 index 000000000000..36b7aab39fda --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_application_health_policy_py3.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ArmApplicationHealthPolicy(Model): + """Defines a health policy used to evaluate the health of an application or + one of its children entities. + . + + :param consider_warning_as_error: Indicates whether warnings are treated + with the same severity as errors. Default value: False . + :type consider_warning_as_error: bool + :param max_percent_unhealthy_deployed_applications: The maximum allowed + percentage of unhealthy deployed applications. Allowed values are Byte + values from zero to 100. + The percentage represents the maximum tolerated percentage of deployed + applications that can be unhealthy before the application is considered in + error. + This is calculated by dividing the number of unhealthy deployed + applications over the number of nodes where the application is currently + deployed on in the cluster. + The computation rounds up to tolerate one failure on small numbers of + nodes. Default percentage is zero. + . Default value: 0 . + :type max_percent_unhealthy_deployed_applications: int + :param default_service_type_health_policy: The health policy used by + default to evaluate the health of a service type. + :type default_service_type_health_policy: + ~azure.mgmt.servicefabric.models.ArmServiceTypeHealthPolicy + :param service_type_health_policy_map: The map with service type health + policy per service type name. The map is empty by default. + :type service_type_health_policy_map: dict[str, + ~azure.mgmt.servicefabric.models.ArmServiceTypeHealthPolicy] + """ + + _attribute_map = { + 'consider_warning_as_error': {'key': 'considerWarningAsError', 'type': 'bool'}, + 'max_percent_unhealthy_deployed_applications': {'key': 'maxPercentUnhealthyDeployedApplications', 'type': 'int'}, + 'default_service_type_health_policy': {'key': 'defaultServiceTypeHealthPolicy', 'type': 'ArmServiceTypeHealthPolicy'}, + 'service_type_health_policy_map': {'key': 'serviceTypeHealthPolicyMap', 'type': '{ArmServiceTypeHealthPolicy}'}, + } + + def __init__(self, *, consider_warning_as_error: bool=False, max_percent_unhealthy_deployed_applications: int=0, default_service_type_health_policy=None, service_type_health_policy_map=None, **kwargs) -> None: + super(ArmApplicationHealthPolicy, self).__init__(**kwargs) + self.consider_warning_as_error = consider_warning_as_error + self.max_percent_unhealthy_deployed_applications = max_percent_unhealthy_deployed_applications + self.default_service_type_health_policy = default_service_type_health_policy + self.service_type_health_policy_map = service_type_health_policy_map diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_rolling_upgrade_monitoring_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_rolling_upgrade_monitoring_policy.py new file mode 100644 index 000000000000..c44bf130afbc --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_rolling_upgrade_monitoring_policy.py @@ -0,0 +1,68 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ArmRollingUpgradeMonitoringPolicy(Model): + """The policy used for monitoring the application upgrade. + + :param failure_action: The activation Mode of the service package. + Possible values include: 'Rollback', 'Manual' + :type failure_action: str or + ~azure.mgmt.servicefabric.models.ArmUpgradeFailureAction + :param health_check_wait_duration: The amount of time to wait after + completing an upgrade domain before applying health policies. It is first + interpreted as a string representing an ISO 8601 duration. If that fails, + then it is interpreted as a number representing the total number of + milliseconds. + :type health_check_wait_duration: str + :param health_check_stable_duration: The amount of time that the + application or cluster must remain healthy before the upgrade proceeds to + the next upgrade domain. It is first interpreted as a string representing + an ISO 8601 duration. If that fails, then it is interpreted as a number + representing the total number of milliseconds. + :type health_check_stable_duration: str + :param health_check_retry_timeout: The amount of time to retry health + evaluation when the application or cluster is unhealthy before + FailureAction is executed. It is first interpreted as a string + representing an ISO 8601 duration. If that fails, then it is interpreted + as a number representing the total number of milliseconds. + :type health_check_retry_timeout: str + :param upgrade_timeout: The amount of time the overall upgrade has to + complete before FailureAction is executed. It is first interpreted as a + string representing an ISO 8601 duration. If that fails, then it is + interpreted as a number representing the total number of milliseconds. + :type upgrade_timeout: str + :param upgrade_domain_timeout: The amount of time each upgrade domain has + to complete before FailureAction is executed. It is first interpreted as a + string representing an ISO 8601 duration. If that fails, then it is + interpreted as a number representing the total number of milliseconds. + :type upgrade_domain_timeout: str + """ + + _attribute_map = { + 'failure_action': {'key': 'failureAction', 'type': 'str'}, + 'health_check_wait_duration': {'key': 'healthCheckWaitDuration', 'type': 'str'}, + 'health_check_stable_duration': {'key': 'healthCheckStableDuration', 'type': 'str'}, + 'health_check_retry_timeout': {'key': 'healthCheckRetryTimeout', 'type': 'str'}, + 'upgrade_timeout': {'key': 'upgradeTimeout', 'type': 'str'}, + 'upgrade_domain_timeout': {'key': 'upgradeDomainTimeout', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ArmRollingUpgradeMonitoringPolicy, self).__init__(**kwargs) + self.failure_action = kwargs.get('failure_action', None) + self.health_check_wait_duration = kwargs.get('health_check_wait_duration', None) + self.health_check_stable_duration = kwargs.get('health_check_stable_duration', None) + self.health_check_retry_timeout = kwargs.get('health_check_retry_timeout', None) + self.upgrade_timeout = kwargs.get('upgrade_timeout', None) + self.upgrade_domain_timeout = kwargs.get('upgrade_domain_timeout', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_rolling_upgrade_monitoring_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_rolling_upgrade_monitoring_policy_py3.py new file mode 100644 index 000000000000..377fa603ed6e --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_rolling_upgrade_monitoring_policy_py3.py @@ -0,0 +1,68 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ArmRollingUpgradeMonitoringPolicy(Model): + """The policy used for monitoring the application upgrade. + + :param failure_action: The activation Mode of the service package. + Possible values include: 'Rollback', 'Manual' + :type failure_action: str or + ~azure.mgmt.servicefabric.models.ArmUpgradeFailureAction + :param health_check_wait_duration: The amount of time to wait after + completing an upgrade domain before applying health policies. It is first + interpreted as a string representing an ISO 8601 duration. If that fails, + then it is interpreted as a number representing the total number of + milliseconds. + :type health_check_wait_duration: str + :param health_check_stable_duration: The amount of time that the + application or cluster must remain healthy before the upgrade proceeds to + the next upgrade domain. It is first interpreted as a string representing + an ISO 8601 duration. If that fails, then it is interpreted as a number + representing the total number of milliseconds. + :type health_check_stable_duration: str + :param health_check_retry_timeout: The amount of time to retry health + evaluation when the application or cluster is unhealthy before + FailureAction is executed. It is first interpreted as a string + representing an ISO 8601 duration. If that fails, then it is interpreted + as a number representing the total number of milliseconds. + :type health_check_retry_timeout: str + :param upgrade_timeout: The amount of time the overall upgrade has to + complete before FailureAction is executed. It is first interpreted as a + string representing an ISO 8601 duration. If that fails, then it is + interpreted as a number representing the total number of milliseconds. + :type upgrade_timeout: str + :param upgrade_domain_timeout: The amount of time each upgrade domain has + to complete before FailureAction is executed. It is first interpreted as a + string representing an ISO 8601 duration. If that fails, then it is + interpreted as a number representing the total number of milliseconds. + :type upgrade_domain_timeout: str + """ + + _attribute_map = { + 'failure_action': {'key': 'failureAction', 'type': 'str'}, + 'health_check_wait_duration': {'key': 'healthCheckWaitDuration', 'type': 'str'}, + 'health_check_stable_duration': {'key': 'healthCheckStableDuration', 'type': 'str'}, + 'health_check_retry_timeout': {'key': 'healthCheckRetryTimeout', 'type': 'str'}, + 'upgrade_timeout': {'key': 'upgradeTimeout', 'type': 'str'}, + 'upgrade_domain_timeout': {'key': 'upgradeDomainTimeout', 'type': 'str'}, + } + + def __init__(self, *, failure_action=None, health_check_wait_duration: str=None, health_check_stable_duration: str=None, health_check_retry_timeout: str=None, upgrade_timeout: str=None, upgrade_domain_timeout: str=None, **kwargs) -> None: + super(ArmRollingUpgradeMonitoringPolicy, self).__init__(**kwargs) + self.failure_action = failure_action + self.health_check_wait_duration = health_check_wait_duration + self.health_check_stable_duration = health_check_stable_duration + self.health_check_retry_timeout = health_check_retry_timeout + self.upgrade_timeout = upgrade_timeout + self.upgrade_domain_timeout = upgrade_domain_timeout diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_service_type_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_service_type_health_policy.py new file mode 100644 index 000000000000..980fdb596e20 --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_service_type_health_policy.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ArmServiceTypeHealthPolicy(Model): + """Represents the health policy used to evaluate the health of services + belonging to a service type. + . + + :param max_percent_unhealthy_services: The maximum percentage of services + allowed to be unhealthy before your application is considered in error. + . Default value: 0 . + :type max_percent_unhealthy_services: int + :param max_percent_unhealthy_partitions_per_service: The maximum + percentage of partitions per service allowed to be unhealthy before your + application is considered in error. + . Default value: 0 . + :type max_percent_unhealthy_partitions_per_service: int + :param max_percent_unhealthy_replicas_per_partition: The maximum + percentage of replicas per partition allowed to be unhealthy before your + application is considered in error. + . Default value: 0 . + :type max_percent_unhealthy_replicas_per_partition: int + """ + + _validation = { + 'max_percent_unhealthy_services': {'maximum': 100, 'minimum': 0}, + 'max_percent_unhealthy_partitions_per_service': {'maximum': 100, 'minimum': 0}, + 'max_percent_unhealthy_replicas_per_partition': {'maximum': 100, 'minimum': 0}, + } + + _attribute_map = { + 'max_percent_unhealthy_services': {'key': 'maxPercentUnhealthyServices', 'type': 'int'}, + 'max_percent_unhealthy_partitions_per_service': {'key': 'maxPercentUnhealthyPartitionsPerService', 'type': 'int'}, + 'max_percent_unhealthy_replicas_per_partition': {'key': 'maxPercentUnhealthyReplicasPerPartition', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(ArmServiceTypeHealthPolicy, self).__init__(**kwargs) + self.max_percent_unhealthy_services = kwargs.get('max_percent_unhealthy_services', 0) + self.max_percent_unhealthy_partitions_per_service = kwargs.get('max_percent_unhealthy_partitions_per_service', 0) + self.max_percent_unhealthy_replicas_per_partition = kwargs.get('max_percent_unhealthy_replicas_per_partition', 0) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_service_type_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_service_type_health_policy_py3.py new file mode 100644 index 000000000000..de542a6772d4 --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/arm_service_type_health_policy_py3.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ArmServiceTypeHealthPolicy(Model): + """Represents the health policy used to evaluate the health of services + belonging to a service type. + . + + :param max_percent_unhealthy_services: The maximum percentage of services + allowed to be unhealthy before your application is considered in error. + . Default value: 0 . + :type max_percent_unhealthy_services: int + :param max_percent_unhealthy_partitions_per_service: The maximum + percentage of partitions per service allowed to be unhealthy before your + application is considered in error. + . Default value: 0 . + :type max_percent_unhealthy_partitions_per_service: int + :param max_percent_unhealthy_replicas_per_partition: The maximum + percentage of replicas per partition allowed to be unhealthy before your + application is considered in error. + . Default value: 0 . + :type max_percent_unhealthy_replicas_per_partition: int + """ + + _validation = { + 'max_percent_unhealthy_services': {'maximum': 100, 'minimum': 0}, + 'max_percent_unhealthy_partitions_per_service': {'maximum': 100, 'minimum': 0}, + 'max_percent_unhealthy_replicas_per_partition': {'maximum': 100, 'minimum': 0}, + } + + _attribute_map = { + 'max_percent_unhealthy_services': {'key': 'maxPercentUnhealthyServices', 'type': 'int'}, + 'max_percent_unhealthy_partitions_per_service': {'key': 'maxPercentUnhealthyPartitionsPerService', 'type': 'int'}, + 'max_percent_unhealthy_replicas_per_partition': {'key': 'maxPercentUnhealthyReplicasPerPartition', 'type': 'int'}, + } + + def __init__(self, *, max_percent_unhealthy_services: int=0, max_percent_unhealthy_partitions_per_service: int=0, max_percent_unhealthy_replicas_per_partition: int=0, **kwargs) -> None: + super(ArmServiceTypeHealthPolicy, self).__init__(**kwargs) + self.max_percent_unhealthy_services = max_percent_unhealthy_services + self.max_percent_unhealthy_partitions_per_service = max_percent_unhealthy_partitions_per_service + self.max_percent_unhealthy_replicas_per_partition = max_percent_unhealthy_replicas_per_partition diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display.py index 2b7871e8e9a0..e43cfb3bfd48 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display.py @@ -13,7 +13,7 @@ class AvailableOperationDisplay(Model): - """Operation supported by Service Fabric resource provider. + """Operation supported by the Service Fabric resource provider. :param provider: The name of the provider. :type provider: str diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display_py3.py index 89bcebaf9550..272920503071 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/available_operation_display_py3.py @@ -13,7 +13,7 @@ class AvailableOperationDisplay(Model): - """Operation supported by Service Fabric resource provider. + """Operation supported by the Service Fabric resource provider. :param provider: The name of the provider. :type provider: str diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster.py index 39b51676c351..1daf2f7b4239 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster.py @@ -21,91 +21,146 @@ class Cluster(Resource): All required parameters must be populated in order to send to Azure. - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Required. Azure resource location. :type location: str - :param tags: Resource tags. + :param tags: Azure resource tags. :type tags: dict[str, str] - :param available_cluster_versions: The Service Fabric runtime versions + :ivar etag: Azure resource etag. + :vartype etag: str + :param add_on_features: The list of add-on features to enable in the + cluster. + :type add_on_features: list[str] + :ivar available_cluster_versions: The Service Fabric runtime versions available for this cluster. - :type available_cluster_versions: + :vartype available_cluster_versions: list[~azure.mgmt.servicefabric.models.ClusterVersionDetails] - :ivar cluster_id: A service generated unique identifier for the cluster - resource. - :vartype cluster_id: str - :param cluster_state: Possible values include: 'WaitingForNodes', - 'Deploying', 'BaselineUpgrade', 'UpdatingUserConfiguration', - 'UpdatingUserCertificate', 'UpdatingInfrastructure', - 'EnforcingClusterVersion', 'UpgradeServiceUnreachable', 'AutoScale', - 'Ready' - :type cluster_state: str or ~azure.mgmt.servicefabric.models.enum - :ivar cluster_endpoint: The Azure Resource Provider endpoint. A system - service in the cluster connects to this endpoint. - :vartype cluster_endpoint: str - :param cluster_code_version: The Service Fabric runtime version of the - cluster. This property can only by set the user when **upgradeMode** is - set to 'Manual'. To get list of available Service Fabric versions for new - clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of - available version for existing clusters use **availableClusterVersions**. - :type cluster_code_version: str + :param azure_active_directory: The AAD authentication settings of the + cluster. + :type azure_active_directory: + ~azure.mgmt.servicefabric.models.AzureActiveDirectory :param certificate: The certificate to use for securing the cluster. The - certificate provided will be used for node to node security within the - cluster, SSL certificate for cluster management endpoint and default - admin client. + certificate provided will be used for node to node security within the + cluster, SSL certificate for cluster management endpoint and default admin + client. :type certificate: ~azure.mgmt.servicefabric.models.CertificateDescription - :param reliability_level: Possible values include: 'None', 'Bronze', - 'Silver', 'Gold', 'Platinum' - :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum - :param upgrade_mode: Possible values include: 'Automatic', 'Manual' - :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum - :param client_certificate_thumbprints: The list of client certificates - referenced by thumbprint that are allowed to manage the cluster. - :type client_certificate_thumbprints: - list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param certificate_common_names: Describes a list of server certificates + referenced by common name that are used to secure the cluster. + :type certificate_common_names: + ~azure.mgmt.servicefabric.models.ServerCertificateCommonNames :param client_certificate_common_names: The list of client certificates referenced by common name that are allowed to manage the cluster. :type client_certificate_common_names: list[~azure.mgmt.servicefabric.models.ClientCertificateCommonName] + :param client_certificate_thumbprints: The list of client certificates + referenced by thumbprint that are allowed to manage the cluster. + :type client_certificate_thumbprints: + list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param cluster_code_version: The Service Fabric runtime version of the + cluster. This property can only by set the user when **upgradeMode** is + set to 'Manual'. To get list of available Service Fabric versions for new + clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of + available version for existing clusters use **availableClusterVersions**. + :type cluster_code_version: str + :ivar cluster_endpoint: The Azure Resource Provider endpoint. A system + service in the cluster connects to this endpoint. + :vartype cluster_endpoint: str + :ivar cluster_id: A service generated unique identifier for the cluster + resource. + :vartype cluster_id: str + :ivar cluster_state: The current state of the cluster. + - WaitingForNodes - Indicates that the cluster resource is created and the + resource provider is waiting for Service Fabric VM extension to boot up + and report to it. + - Deploying - Indicates that the Service Fabric runtime is being installed + on the VMs. Cluster resource will be in this state until the cluster boots + up and system services are up. + - BaselineUpgrade - Indicates that the cluster is upgrading to establishes + the cluster version. This upgrade is automatically initiated when the + cluster boots up for the first time. + - UpdatingUserConfiguration - Indicates that the cluster is being upgraded + with the user provided configuration. + - UpdatingUserCertificate - Indicates that the cluster is being upgraded + with the user provided certificate. + - UpdatingInfrastructure - Indicates that the cluster is being upgraded + with the latest Service Fabric runtime version. This happens only when the + **upgradeMode** is set to 'Automatic'. + - EnforcingClusterVersion - Indicates that cluster is on a different + version than expected and the cluster is being upgraded to the expected + version. + - UpgradeServiceUnreachable - Indicates that the system service in the + cluster is no longer polling the Resource Provider. Clusters in this state + cannot be managed by the Resource Provider. + - AutoScale - Indicates that the ReliabilityLevel of the cluster is being + adjusted. + - Ready - Indicates that the cluster is in a stable state. + . Possible values include: 'WaitingForNodes', 'Deploying', + 'BaselineUpgrade', 'UpdatingUserConfiguration', 'UpdatingUserCertificate', + 'UpdatingInfrastructure', 'EnforcingClusterVersion', + 'UpgradeServiceUnreachable', 'AutoScale', 'Ready' + :vartype cluster_state: str or ~azure.mgmt.servicefabric.models.enum + :param diagnostics_storage_account_config: The storage account information + for storing Service Fabric diagnostic logs. + :type diagnostics_storage_account_config: + ~azure.mgmt.servicefabric.models.DiagnosticsStorageAccountConfig + :param event_store_service_enabled: Indicates if the event store service + is enabled. + :type event_store_service_enabled: bool :param fabric_settings: The list of custom fabric settings to configure the cluster. :type fabric_settings: list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] - :param reverse_proxy_certificate: The server certificate used by reverse - proxy. - :type reverse_proxy_certificate: - ~azure.mgmt.servicefabric.models.CertificateDescription :param management_endpoint: Required. The http management endpoint of the cluster. :type management_endpoint: str :param node_types: Required. The list of node types in the cluster. :type node_types: list[~azure.mgmt.servicefabric.models.NodeTypeDescription] - :param azure_active_directory: The AAD authentication settings of the - cluster. - :type azure_active_directory: - ~azure.mgmt.servicefabric.models.AzureActiveDirectory :ivar provisioning_state: The provisioning state of the cluster resource. Possible values include: 'Updating', 'Succeeded', 'Failed', 'Canceled' :vartype provisioning_state: str or ~azure.mgmt.servicefabric.models.ProvisioningState - :param vm_image: The VM image VMSS has been configured with. Generic names - such as Windows or Linux can be used. - :type vm_image: str - :param diagnostics_storage_account_config: The storage account information - for storing Service Fabric diagnostic logs. - :type diagnostics_storage_account_config: - ~azure.mgmt.servicefabric.models.DiagnosticsStorageAccountConfig + :param reliability_level: The reliability level sets the replica set size + of system services. Learn about + [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + - None - Run the System services with a target replica set count of 1. + This should only be used for test clusters. + - Bronze - Run the System services with a target replica set count of 3. + This should only be used for test clusters. + - Silver - Run the System services with a target replica set count of 5. + - Gold - Run the System services with a target replica set count of 7. + - Platinum - Run the System services with a target replica set count of 9. + . Possible values include: 'None', 'Bronze', 'Silver', 'Gold', 'Platinum' + :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum + :param reverse_proxy_certificate: The server certificate used by reverse + proxy. + :type reverse_proxy_certificate: + ~azure.mgmt.servicefabric.models.CertificateDescription + :param reverse_proxy_certificate_common_names: Describes a list of server + certificates referenced by common name that are used to secure the + cluster. + :type reverse_proxy_certificate_common_names: + ~azure.mgmt.servicefabric.models.ServerCertificateCommonNames :param upgrade_description: The policy to use when upgrading the cluster. :type upgrade_description: ~azure.mgmt.servicefabric.models.ClusterUpgradePolicy - :param add_on_features: The list of add-on features to enable in the - cluster. - :type add_on_features: list[str] + :param upgrade_mode: The upgrade mode of the cluster when new Service + Fabric runtime version is available. + - Automatic - The cluster will be automatically upgraded to the latest + Service Fabric runtime version as soon as it is available. + - Manual - The cluster will not be automatically upgraded to the latest + Service Fabric runtime version. The cluster is upgraded by setting the + **clusterCodeVersion** property in the cluster resource. + . Possible values include: 'Automatic', 'Manual' + :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum + :param vm_image: The VM image VMSS has been configured with. Generic names + such as Windows or Linux can be used. + :type vm_image: str """ _validation = { @@ -113,8 +168,11 @@ class Cluster(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'location': {'required': True}, - 'cluster_id': {'readonly': True}, + 'etag': {'readonly': True}, + 'available_cluster_versions': {'readonly': True}, 'cluster_endpoint': {'readonly': True}, + 'cluster_id': {'readonly': True}, + 'cluster_state': {'readonly': True}, 'management_endpoint': {'required': True}, 'node_types': {'required': True}, 'provisioning_state': {'readonly': True}, @@ -126,47 +184,54 @@ class Cluster(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, + 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, 'available_cluster_versions': {'key': 'properties.availableClusterVersions', 'type': '[ClusterVersionDetails]'}, - 'cluster_id': {'key': 'properties.clusterId', 'type': 'str'}, - 'cluster_state': {'key': 'properties.clusterState', 'type': 'str'}, - 'cluster_endpoint': {'key': 'properties.clusterEndpoint', 'type': 'str'}, - 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, 'certificate': {'key': 'properties.certificate', 'type': 'CertificateDescription'}, - 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, - 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, - 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'certificate_common_names': {'key': 'properties.certificateCommonNames', 'type': 'ServerCertificateCommonNames'}, 'client_certificate_common_names': {'key': 'properties.clientCertificateCommonNames', 'type': '[ClientCertificateCommonName]'}, + 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'cluster_endpoint': {'key': 'properties.clusterEndpoint', 'type': 'str'}, + 'cluster_id': {'key': 'properties.clusterId', 'type': 'str'}, + 'cluster_state': {'key': 'properties.clusterState', 'type': 'str'}, + 'diagnostics_storage_account_config': {'key': 'properties.diagnosticsStorageAccountConfig', 'type': 'DiagnosticsStorageAccountConfig'}, + 'event_store_service_enabled': {'key': 'properties.eventStoreServiceEnabled', 'type': 'bool'}, 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, - 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, 'management_endpoint': {'key': 'properties.managementEndpoint', 'type': 'str'}, 'node_types': {'key': 'properties.nodeTypes', 'type': '[NodeTypeDescription]'}, - 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'vm_image': {'key': 'properties.vmImage', 'type': 'str'}, - 'diagnostics_storage_account_config': {'key': 'properties.diagnosticsStorageAccountConfig', 'type': 'DiagnosticsStorageAccountConfig'}, + 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, + 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, + 'reverse_proxy_certificate_common_names': {'key': 'properties.reverseProxyCertificateCommonNames', 'type': 'ServerCertificateCommonNames'}, 'upgrade_description': {'key': 'properties.upgradeDescription', 'type': 'ClusterUpgradePolicy'}, - 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, + 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, + 'vm_image': {'key': 'properties.vmImage', 'type': 'str'}, } def __init__(self, **kwargs): super(Cluster, self).__init__(**kwargs) - self.available_cluster_versions = kwargs.get('available_cluster_versions', None) - self.cluster_id = None - self.cluster_state = kwargs.get('cluster_state', None) - self.cluster_endpoint = None - self.cluster_code_version = kwargs.get('cluster_code_version', None) + self.add_on_features = kwargs.get('add_on_features', None) + self.available_cluster_versions = None + self.azure_active_directory = kwargs.get('azure_active_directory', None) self.certificate = kwargs.get('certificate', None) - self.reliability_level = kwargs.get('reliability_level', None) - self.upgrade_mode = kwargs.get('upgrade_mode', None) - self.client_certificate_thumbprints = kwargs.get('client_certificate_thumbprints', None) + self.certificate_common_names = kwargs.get('certificate_common_names', None) self.client_certificate_common_names = kwargs.get('client_certificate_common_names', None) + self.client_certificate_thumbprints = kwargs.get('client_certificate_thumbprints', None) + self.cluster_code_version = kwargs.get('cluster_code_version', None) + self.cluster_endpoint = None + self.cluster_id = None + self.cluster_state = None + self.diagnostics_storage_account_config = kwargs.get('diagnostics_storage_account_config', None) + self.event_store_service_enabled = kwargs.get('event_store_service_enabled', None) self.fabric_settings = kwargs.get('fabric_settings', None) - self.reverse_proxy_certificate = kwargs.get('reverse_proxy_certificate', None) self.management_endpoint = kwargs.get('management_endpoint', None) self.node_types = kwargs.get('node_types', None) - self.azure_active_directory = kwargs.get('azure_active_directory', None) self.provisioning_state = None - self.vm_image = kwargs.get('vm_image', None) - self.diagnostics_storage_account_config = kwargs.get('diagnostics_storage_account_config', None) + self.reliability_level = kwargs.get('reliability_level', None) + self.reverse_proxy_certificate = kwargs.get('reverse_proxy_certificate', None) + self.reverse_proxy_certificate_common_names = kwargs.get('reverse_proxy_certificate_common_names', None) self.upgrade_description = kwargs.get('upgrade_description', None) - self.add_on_features = kwargs.get('add_on_features', None) + self.upgrade_mode = kwargs.get('upgrade_mode', None) + self.vm_image = kwargs.get('vm_image', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result.py index 02d36c18089d..a065d98e9310 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result.py @@ -13,7 +13,7 @@ class ClusterCodeVersionsListResult(Model): - """The list results of the ServiceFabric runtime versions. + """The list results of the Service Fabric runtime versions. :param value: :type value: diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result_py3.py index 2936641613c5..3be466ff011f 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_list_result_py3.py @@ -13,7 +13,7 @@ class ClusterCodeVersionsListResult(Model): - """The list results of the ServiceFabric runtime versions. + """The list results of the Service Fabric runtime versions. :param value: :type value: diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result.py index 501a6aaba16c..9f36df0d3a22 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result.py @@ -13,7 +13,7 @@ class ClusterCodeVersionsResult(Model): - """The result of the ServiceFabric runtime versions. + """The result of the Service Fabric runtime versions. :param id: The identification of the result :type id: str diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result_py3.py index e80314badc2e..3ccc94d30343 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_code_versions_result_py3.py @@ -13,7 +13,7 @@ class ClusterCodeVersionsResult(Model): - """The result of the ServiceFabric runtime versions. + """The result of the Service Fabric runtime versions. :param id: The identification of the result :type id: str diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy.py index 9c01a991be1c..ab71593153eb 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy.py @@ -15,15 +15,43 @@ class ClusterHealthPolicy(Model): """Defines a health policy used to evaluate the health of the cluster or of a cluster node. + . :param max_percent_unhealthy_nodes: The maximum allowed percentage of unhealthy nodes before reporting an error. For example, to allow 10% of nodes to be unhealthy, this value would be 10. + The percentage represents the maximum tolerated percentage of nodes that + can be unhealthy before the cluster is considered in error. + If the percentage is respected but there is at least one unhealthy node, + the health is evaluated as Warning. + The percentage is calculated by dividing the number of unhealthy nodes + over the total number of nodes in the cluster. + The computation rounds up to tolerate one failure on small numbers of + nodes. Default percentage is zero. + In large clusters, some nodes will always be down or out for repairs, so + this percentage should be configured to tolerate that. + . Default value: 0 . :type max_percent_unhealthy_nodes: int :param max_percent_unhealthy_applications: The maximum allowed percentage of unhealthy applications before reporting an error. For example, to allow 10% of applications to be unhealthy, this value would be 10. + The percentage represents the maximum tolerated percentage of applications + that can be unhealthy before the cluster is considered in error. + If the percentage is respected but there is at least one unhealthy + application, the health is evaluated as Warning. + This is calculated by dividing the number of unhealthy applications over + the total number of application instances in the cluster, excluding + applications of application types that are included in the + ApplicationTypeHealthPolicyMap. + The computation rounds up to tolerate one failure on small numbers of + applications. Default percentage is zero. + . Default value: 0 . :type max_percent_unhealthy_applications: int + :param application_health_policies: Defines the application health policy + map used to evaluate the health of an application or one of its children + entities. + :type application_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ApplicationHealthPolicy] """ _validation = { @@ -34,9 +62,11 @@ class ClusterHealthPolicy(Model): _attribute_map = { 'max_percent_unhealthy_nodes': {'key': 'maxPercentUnhealthyNodes', 'type': 'int'}, 'max_percent_unhealthy_applications': {'key': 'maxPercentUnhealthyApplications', 'type': 'int'}, + 'application_health_policies': {'key': 'applicationHealthPolicies', 'type': '{ApplicationHealthPolicy}'}, } def __init__(self, **kwargs): super(ClusterHealthPolicy, self).__init__(**kwargs) - self.max_percent_unhealthy_nodes = kwargs.get('max_percent_unhealthy_nodes', None) - self.max_percent_unhealthy_applications = kwargs.get('max_percent_unhealthy_applications', None) + self.max_percent_unhealthy_nodes = kwargs.get('max_percent_unhealthy_nodes', 0) + self.max_percent_unhealthy_applications = kwargs.get('max_percent_unhealthy_applications', 0) + self.application_health_policies = kwargs.get('application_health_policies', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy_py3.py index 3df758bac28f..fd60c2c4387e 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_health_policy_py3.py @@ -15,15 +15,43 @@ class ClusterHealthPolicy(Model): """Defines a health policy used to evaluate the health of the cluster or of a cluster node. + . :param max_percent_unhealthy_nodes: The maximum allowed percentage of unhealthy nodes before reporting an error. For example, to allow 10% of nodes to be unhealthy, this value would be 10. + The percentage represents the maximum tolerated percentage of nodes that + can be unhealthy before the cluster is considered in error. + If the percentage is respected but there is at least one unhealthy node, + the health is evaluated as Warning. + The percentage is calculated by dividing the number of unhealthy nodes + over the total number of nodes in the cluster. + The computation rounds up to tolerate one failure on small numbers of + nodes. Default percentage is zero. + In large clusters, some nodes will always be down or out for repairs, so + this percentage should be configured to tolerate that. + . Default value: 0 . :type max_percent_unhealthy_nodes: int :param max_percent_unhealthy_applications: The maximum allowed percentage of unhealthy applications before reporting an error. For example, to allow 10% of applications to be unhealthy, this value would be 10. + The percentage represents the maximum tolerated percentage of applications + that can be unhealthy before the cluster is considered in error. + If the percentage is respected but there is at least one unhealthy + application, the health is evaluated as Warning. + This is calculated by dividing the number of unhealthy applications over + the total number of application instances in the cluster, excluding + applications of application types that are included in the + ApplicationTypeHealthPolicyMap. + The computation rounds up to tolerate one failure on small numbers of + applications. Default percentage is zero. + . Default value: 0 . :type max_percent_unhealthy_applications: int + :param application_health_policies: Defines the application health policy + map used to evaluate the health of an application or one of its children + entities. + :type application_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ApplicationHealthPolicy] """ _validation = { @@ -34,9 +62,11 @@ class ClusterHealthPolicy(Model): _attribute_map = { 'max_percent_unhealthy_nodes': {'key': 'maxPercentUnhealthyNodes', 'type': 'int'}, 'max_percent_unhealthy_applications': {'key': 'maxPercentUnhealthyApplications', 'type': 'int'}, + 'application_health_policies': {'key': 'applicationHealthPolicies', 'type': '{ApplicationHealthPolicy}'}, } - def __init__(self, *, max_percent_unhealthy_nodes: int=None, max_percent_unhealthy_applications: int=None, **kwargs) -> None: + def __init__(self, *, max_percent_unhealthy_nodes: int=0, max_percent_unhealthy_applications: int=0, application_health_policies=None, **kwargs) -> None: super(ClusterHealthPolicy, self).__init__(**kwargs) self.max_percent_unhealthy_nodes = max_percent_unhealthy_nodes self.max_percent_unhealthy_applications = max_percent_unhealthy_applications + self.application_health_policies = application_health_policies diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_py3.py index 8fdff486c12d..0a5cf3a7e2ef 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_py3.py @@ -21,91 +21,146 @@ class Cluster(Resource): All required parameters must be populated in order to send to Azure. - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Required. Azure resource location. :type location: str - :param tags: Resource tags. + :param tags: Azure resource tags. :type tags: dict[str, str] - :param available_cluster_versions: The Service Fabric runtime versions + :ivar etag: Azure resource etag. + :vartype etag: str + :param add_on_features: The list of add-on features to enable in the + cluster. + :type add_on_features: list[str] + :ivar available_cluster_versions: The Service Fabric runtime versions available for this cluster. - :type available_cluster_versions: + :vartype available_cluster_versions: list[~azure.mgmt.servicefabric.models.ClusterVersionDetails] - :ivar cluster_id: A service generated unique identifier for the cluster - resource. - :vartype cluster_id: str - :param cluster_state: Possible values include: 'WaitingForNodes', - 'Deploying', 'BaselineUpgrade', 'UpdatingUserConfiguration', - 'UpdatingUserCertificate', 'UpdatingInfrastructure', - 'EnforcingClusterVersion', 'UpgradeServiceUnreachable', 'AutoScale', - 'Ready' - :type cluster_state: str or ~azure.mgmt.servicefabric.models.enum - :ivar cluster_endpoint: The Azure Resource Provider endpoint. A system - service in the cluster connects to this endpoint. - :vartype cluster_endpoint: str - :param cluster_code_version: The Service Fabric runtime version of the - cluster. This property can only by set the user when **upgradeMode** is - set to 'Manual'. To get list of available Service Fabric versions for new - clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of - available version for existing clusters use **availableClusterVersions**. - :type cluster_code_version: str + :param azure_active_directory: The AAD authentication settings of the + cluster. + :type azure_active_directory: + ~azure.mgmt.servicefabric.models.AzureActiveDirectory :param certificate: The certificate to use for securing the cluster. The - certificate provided will be used for node to node security within the - cluster, SSL certificate for cluster management endpoint and default - admin client. + certificate provided will be used for node to node security within the + cluster, SSL certificate for cluster management endpoint and default admin + client. :type certificate: ~azure.mgmt.servicefabric.models.CertificateDescription - :param reliability_level: Possible values include: 'None', 'Bronze', - 'Silver', 'Gold', 'Platinum' - :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum - :param upgrade_mode: Possible values include: 'Automatic', 'Manual' - :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum - :param client_certificate_thumbprints: The list of client certificates - referenced by thumbprint that are allowed to manage the cluster. - :type client_certificate_thumbprints: - list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param certificate_common_names: Describes a list of server certificates + referenced by common name that are used to secure the cluster. + :type certificate_common_names: + ~azure.mgmt.servicefabric.models.ServerCertificateCommonNames :param client_certificate_common_names: The list of client certificates referenced by common name that are allowed to manage the cluster. :type client_certificate_common_names: list[~azure.mgmt.servicefabric.models.ClientCertificateCommonName] + :param client_certificate_thumbprints: The list of client certificates + referenced by thumbprint that are allowed to manage the cluster. + :type client_certificate_thumbprints: + list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param cluster_code_version: The Service Fabric runtime version of the + cluster. This property can only by set the user when **upgradeMode** is + set to 'Manual'. To get list of available Service Fabric versions for new + clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of + available version for existing clusters use **availableClusterVersions**. + :type cluster_code_version: str + :ivar cluster_endpoint: The Azure Resource Provider endpoint. A system + service in the cluster connects to this endpoint. + :vartype cluster_endpoint: str + :ivar cluster_id: A service generated unique identifier for the cluster + resource. + :vartype cluster_id: str + :ivar cluster_state: The current state of the cluster. + - WaitingForNodes - Indicates that the cluster resource is created and the + resource provider is waiting for Service Fabric VM extension to boot up + and report to it. + - Deploying - Indicates that the Service Fabric runtime is being installed + on the VMs. Cluster resource will be in this state until the cluster boots + up and system services are up. + - BaselineUpgrade - Indicates that the cluster is upgrading to establishes + the cluster version. This upgrade is automatically initiated when the + cluster boots up for the first time. + - UpdatingUserConfiguration - Indicates that the cluster is being upgraded + with the user provided configuration. + - UpdatingUserCertificate - Indicates that the cluster is being upgraded + with the user provided certificate. + - UpdatingInfrastructure - Indicates that the cluster is being upgraded + with the latest Service Fabric runtime version. This happens only when the + **upgradeMode** is set to 'Automatic'. + - EnforcingClusterVersion - Indicates that cluster is on a different + version than expected and the cluster is being upgraded to the expected + version. + - UpgradeServiceUnreachable - Indicates that the system service in the + cluster is no longer polling the Resource Provider. Clusters in this state + cannot be managed by the Resource Provider. + - AutoScale - Indicates that the ReliabilityLevel of the cluster is being + adjusted. + - Ready - Indicates that the cluster is in a stable state. + . Possible values include: 'WaitingForNodes', 'Deploying', + 'BaselineUpgrade', 'UpdatingUserConfiguration', 'UpdatingUserCertificate', + 'UpdatingInfrastructure', 'EnforcingClusterVersion', + 'UpgradeServiceUnreachable', 'AutoScale', 'Ready' + :vartype cluster_state: str or ~azure.mgmt.servicefabric.models.enum + :param diagnostics_storage_account_config: The storage account information + for storing Service Fabric diagnostic logs. + :type diagnostics_storage_account_config: + ~azure.mgmt.servicefabric.models.DiagnosticsStorageAccountConfig + :param event_store_service_enabled: Indicates if the event store service + is enabled. + :type event_store_service_enabled: bool :param fabric_settings: The list of custom fabric settings to configure the cluster. :type fabric_settings: list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] - :param reverse_proxy_certificate: The server certificate used by reverse - proxy. - :type reverse_proxy_certificate: - ~azure.mgmt.servicefabric.models.CertificateDescription :param management_endpoint: Required. The http management endpoint of the cluster. :type management_endpoint: str :param node_types: Required. The list of node types in the cluster. :type node_types: list[~azure.mgmt.servicefabric.models.NodeTypeDescription] - :param azure_active_directory: The AAD authentication settings of the - cluster. - :type azure_active_directory: - ~azure.mgmt.servicefabric.models.AzureActiveDirectory :ivar provisioning_state: The provisioning state of the cluster resource. Possible values include: 'Updating', 'Succeeded', 'Failed', 'Canceled' :vartype provisioning_state: str or ~azure.mgmt.servicefabric.models.ProvisioningState - :param vm_image: The VM image VMSS has been configured with. Generic names - such as Windows or Linux can be used. - :type vm_image: str - :param diagnostics_storage_account_config: The storage account information - for storing Service Fabric diagnostic logs. - :type diagnostics_storage_account_config: - ~azure.mgmt.servicefabric.models.DiagnosticsStorageAccountConfig + :param reliability_level: The reliability level sets the replica set size + of system services. Learn about + [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + - None - Run the System services with a target replica set count of 1. + This should only be used for test clusters. + - Bronze - Run the System services with a target replica set count of 3. + This should only be used for test clusters. + - Silver - Run the System services with a target replica set count of 5. + - Gold - Run the System services with a target replica set count of 7. + - Platinum - Run the System services with a target replica set count of 9. + . Possible values include: 'None', 'Bronze', 'Silver', 'Gold', 'Platinum' + :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum + :param reverse_proxy_certificate: The server certificate used by reverse + proxy. + :type reverse_proxy_certificate: + ~azure.mgmt.servicefabric.models.CertificateDescription + :param reverse_proxy_certificate_common_names: Describes a list of server + certificates referenced by common name that are used to secure the + cluster. + :type reverse_proxy_certificate_common_names: + ~azure.mgmt.servicefabric.models.ServerCertificateCommonNames :param upgrade_description: The policy to use when upgrading the cluster. :type upgrade_description: ~azure.mgmt.servicefabric.models.ClusterUpgradePolicy - :param add_on_features: The list of add-on features to enable in the - cluster. - :type add_on_features: list[str] + :param upgrade_mode: The upgrade mode of the cluster when new Service + Fabric runtime version is available. + - Automatic - The cluster will be automatically upgraded to the latest + Service Fabric runtime version as soon as it is available. + - Manual - The cluster will not be automatically upgraded to the latest + Service Fabric runtime version. The cluster is upgraded by setting the + **clusterCodeVersion** property in the cluster resource. + . Possible values include: 'Automatic', 'Manual' + :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum + :param vm_image: The VM image VMSS has been configured with. Generic names + such as Windows or Linux can be used. + :type vm_image: str """ _validation = { @@ -113,8 +168,11 @@ class Cluster(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'location': {'required': True}, - 'cluster_id': {'readonly': True}, + 'etag': {'readonly': True}, + 'available_cluster_versions': {'readonly': True}, 'cluster_endpoint': {'readonly': True}, + 'cluster_id': {'readonly': True}, + 'cluster_state': {'readonly': True}, 'management_endpoint': {'required': True}, 'node_types': {'required': True}, 'provisioning_state': {'readonly': True}, @@ -126,47 +184,54 @@ class Cluster(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, + 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, 'available_cluster_versions': {'key': 'properties.availableClusterVersions', 'type': '[ClusterVersionDetails]'}, - 'cluster_id': {'key': 'properties.clusterId', 'type': 'str'}, - 'cluster_state': {'key': 'properties.clusterState', 'type': 'str'}, - 'cluster_endpoint': {'key': 'properties.clusterEndpoint', 'type': 'str'}, - 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, 'certificate': {'key': 'properties.certificate', 'type': 'CertificateDescription'}, - 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, - 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, - 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'certificate_common_names': {'key': 'properties.certificateCommonNames', 'type': 'ServerCertificateCommonNames'}, 'client_certificate_common_names': {'key': 'properties.clientCertificateCommonNames', 'type': '[ClientCertificateCommonName]'}, + 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'cluster_endpoint': {'key': 'properties.clusterEndpoint', 'type': 'str'}, + 'cluster_id': {'key': 'properties.clusterId', 'type': 'str'}, + 'cluster_state': {'key': 'properties.clusterState', 'type': 'str'}, + 'diagnostics_storage_account_config': {'key': 'properties.diagnosticsStorageAccountConfig', 'type': 'DiagnosticsStorageAccountConfig'}, + 'event_store_service_enabled': {'key': 'properties.eventStoreServiceEnabled', 'type': 'bool'}, 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, - 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, 'management_endpoint': {'key': 'properties.managementEndpoint', 'type': 'str'}, 'node_types': {'key': 'properties.nodeTypes', 'type': '[NodeTypeDescription]'}, - 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'vm_image': {'key': 'properties.vmImage', 'type': 'str'}, - 'diagnostics_storage_account_config': {'key': 'properties.diagnosticsStorageAccountConfig', 'type': 'DiagnosticsStorageAccountConfig'}, + 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, + 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, + 'reverse_proxy_certificate_common_names': {'key': 'properties.reverseProxyCertificateCommonNames', 'type': 'ServerCertificateCommonNames'}, 'upgrade_description': {'key': 'properties.upgradeDescription', 'type': 'ClusterUpgradePolicy'}, - 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, + 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, + 'vm_image': {'key': 'properties.vmImage', 'type': 'str'}, } - def __init__(self, *, location: str, management_endpoint: str, node_types, tags=None, available_cluster_versions=None, cluster_state=None, cluster_code_version: str=None, certificate=None, reliability_level=None, upgrade_mode=None, client_certificate_thumbprints=None, client_certificate_common_names=None, fabric_settings=None, reverse_proxy_certificate=None, azure_active_directory=None, vm_image: str=None, diagnostics_storage_account_config=None, upgrade_description=None, add_on_features=None, **kwargs) -> None: + def __init__(self, *, location: str, management_endpoint: str, node_types, tags=None, add_on_features=None, azure_active_directory=None, certificate=None, certificate_common_names=None, client_certificate_common_names=None, client_certificate_thumbprints=None, cluster_code_version: str=None, diagnostics_storage_account_config=None, event_store_service_enabled: bool=None, fabric_settings=None, reliability_level=None, reverse_proxy_certificate=None, reverse_proxy_certificate_common_names=None, upgrade_description=None, upgrade_mode=None, vm_image: str=None, **kwargs) -> None: super(Cluster, self).__init__(location=location, tags=tags, **kwargs) - self.available_cluster_versions = available_cluster_versions - self.cluster_id = None - self.cluster_state = cluster_state - self.cluster_endpoint = None - self.cluster_code_version = cluster_code_version + self.add_on_features = add_on_features + self.available_cluster_versions = None + self.azure_active_directory = azure_active_directory self.certificate = certificate - self.reliability_level = reliability_level - self.upgrade_mode = upgrade_mode - self.client_certificate_thumbprints = client_certificate_thumbprints + self.certificate_common_names = certificate_common_names self.client_certificate_common_names = client_certificate_common_names + self.client_certificate_thumbprints = client_certificate_thumbprints + self.cluster_code_version = cluster_code_version + self.cluster_endpoint = None + self.cluster_id = None + self.cluster_state = None + self.diagnostics_storage_account_config = diagnostics_storage_account_config + self.event_store_service_enabled = event_store_service_enabled self.fabric_settings = fabric_settings - self.reverse_proxy_certificate = reverse_proxy_certificate self.management_endpoint = management_endpoint self.node_types = node_types - self.azure_active_directory = azure_active_directory self.provisioning_state = None - self.vm_image = vm_image - self.diagnostics_storage_account_config = diagnostics_storage_account_config + self.reliability_level = reliability_level + self.reverse_proxy_certificate = reverse_proxy_certificate + self.reverse_proxy_certificate_common_names = reverse_proxy_certificate_common_names self.upgrade_description = upgrade_description - self.add_on_features = add_on_features + self.upgrade_mode = upgrade_mode + self.vm_image = vm_image diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters.py index 865c72bc0481..c4cac4a2965b 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters.py @@ -15,85 +15,107 @@ class ClusterUpdateParameters(Model): """Cluster update request. - :param reliability_level: The reliability level sets the replica set size - of system services. Learn about - [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). - Possible values include: 'Bronze', 'Silver', 'Gold' - :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum - :param upgrade_mode: The upgrade mode of the cluster. This indicates if - the cluster should be automatically upgraded when new Service Fabric - runtime version is available. Possible values include: 'Automatic', - 'Manual' - :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum - :param cluster_code_version: The Service Fabric runtime version of the - cluster. This property can only by set the user when **upgradeMode** is - set to 'Manual'. To get list of available Service Fabric versions for new - clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of - available version for existing clusters use **availableClusterVersions**. - :type cluster_code_version: str + :param add_on_features: The list of add-on features to enable in the + cluster. + :type add_on_features: list[str] :param certificate: The certificate to use for securing the cluster. The certificate provided will be used for node to node security within the cluster, SSL certificate for cluster management endpoint and default admin client. :type certificate: ~azure.mgmt.servicefabric.models.CertificateDescription - :param client_certificate_thumbprints: The list of client certificates - referenced by thumbprint that are allowed to manage the cluster. This will - overwrite the existing list. - :type client_certificate_thumbprints: - list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param certificate_common_names: Describes a list of server certificates + referenced by common name that are used to secure the cluster. + :type certificate_common_names: + ~azure.mgmt.servicefabric.models.ServerCertificateCommonNames :param client_certificate_common_names: The list of client certificates referenced by common name that are allowed to manage the cluster. This will overwrite the existing list. :type client_certificate_common_names: list[~azure.mgmt.servicefabric.models.ClientCertificateCommonName] + :param client_certificate_thumbprints: The list of client certificates + referenced by thumbprint that are allowed to manage the cluster. This will + overwrite the existing list. + :type client_certificate_thumbprints: + list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param cluster_code_version: The Service Fabric runtime version of the + cluster. This property can only by set the user when **upgradeMode** is + set to 'Manual'. To get list of available Service Fabric versions for new + clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of + available version for existing clusters use **availableClusterVersions**. + :type cluster_code_version: str + :param event_store_service_enabled: Indicates if the event store service + is enabled. + :type event_store_service_enabled: bool :param fabric_settings: The list of custom fabric settings to configure the cluster. This will overwrite the existing list. :type fabric_settings: list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] - :param reverse_proxy_certificate: The server certificate used by reverse - proxy. - :type reverse_proxy_certificate: - ~azure.mgmt.servicefabric.models.CertificateDescription :param node_types: The list of node types in the cluster. This will overwrite the existing list. :type node_types: list[~azure.mgmt.servicefabric.models.NodeTypeDescription] + :param reliability_level: The reliability level sets the replica set size + of system services. Learn about + [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + - None - Run the System services with a target replica set count of 1. + This should only be used for test clusters. + - Bronze - Run the System services with a target replica set count of 3. + This should only be used for test clusters. + - Silver - Run the System services with a target replica set count of 5. + - Gold - Run the System services with a target replica set count of 7. + - Platinum - Run the System services with a target replica set count of 9. + . Possible values include: 'None', 'Bronze', 'Silver', 'Gold', 'Platinum' + :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum + :param reverse_proxy_certificate: The server certificate used by reverse + proxy. + :type reverse_proxy_certificate: + ~azure.mgmt.servicefabric.models.CertificateDescription :param upgrade_description: The policy to use when upgrading the cluster. :type upgrade_description: ~azure.mgmt.servicefabric.models.ClusterUpgradePolicy - :param add_on_features: The list of add-on features to enable in the - cluster. - :type add_on_features: list[str] + :param upgrade_mode: The upgrade mode of the cluster when new Service + Fabric runtime version is available. + - Automatic - The cluster will be automatically upgraded to the latest + Service Fabric runtime version as soon as it is available. + - Manual - The cluster will not be automatically upgraded to the latest + Service Fabric runtime version. The cluster is upgraded by setting the + **clusterCodeVersion** property in the cluster resource. + . Possible values include: 'Automatic', 'Manual' + :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum :param tags: Cluster update parameters :type tags: dict[str, str] """ _attribute_map = { - 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, - 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, - 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, 'certificate': {'key': 'properties.certificate', 'type': 'CertificateDescription'}, - 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'certificate_common_names': {'key': 'properties.certificateCommonNames', 'type': 'ServerCertificateCommonNames'}, 'client_certificate_common_names': {'key': 'properties.clientCertificateCommonNames', 'type': '[ClientCertificateCommonName]'}, + 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'event_store_service_enabled': {'key': 'properties.eventStoreServiceEnabled', 'type': 'bool'}, 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, - 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, 'node_types': {'key': 'properties.nodeTypes', 'type': '[NodeTypeDescription]'}, + 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, + 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, 'upgrade_description': {'key': 'properties.upgradeDescription', 'type': 'ClusterUpgradePolicy'}, - 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, + 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, } def __init__(self, **kwargs): super(ClusterUpdateParameters, self).__init__(**kwargs) - self.reliability_level = kwargs.get('reliability_level', None) - self.upgrade_mode = kwargs.get('upgrade_mode', None) - self.cluster_code_version = kwargs.get('cluster_code_version', None) + self.add_on_features = kwargs.get('add_on_features', None) self.certificate = kwargs.get('certificate', None) - self.client_certificate_thumbprints = kwargs.get('client_certificate_thumbprints', None) + self.certificate_common_names = kwargs.get('certificate_common_names', None) self.client_certificate_common_names = kwargs.get('client_certificate_common_names', None) + self.client_certificate_thumbprints = kwargs.get('client_certificate_thumbprints', None) + self.cluster_code_version = kwargs.get('cluster_code_version', None) + self.event_store_service_enabled = kwargs.get('event_store_service_enabled', None) self.fabric_settings = kwargs.get('fabric_settings', None) - self.reverse_proxy_certificate = kwargs.get('reverse_proxy_certificate', None) self.node_types = kwargs.get('node_types', None) + self.reliability_level = kwargs.get('reliability_level', None) + self.reverse_proxy_certificate = kwargs.get('reverse_proxy_certificate', None) self.upgrade_description = kwargs.get('upgrade_description', None) - self.add_on_features = kwargs.get('add_on_features', None) + self.upgrade_mode = kwargs.get('upgrade_mode', None) self.tags = kwargs.get('tags', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters_py3.py index a7fe7817470c..7bcc9af5d52d 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_update_parameters_py3.py @@ -15,85 +15,107 @@ class ClusterUpdateParameters(Model): """Cluster update request. - :param reliability_level: The reliability level sets the replica set size - of system services. Learn about - [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). - Possible values include: 'Bronze', 'Silver', 'Gold' - :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum - :param upgrade_mode: The upgrade mode of the cluster. This indicates if - the cluster should be automatically upgraded when new Service Fabric - runtime version is available. Possible values include: 'Automatic', - 'Manual' - :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum - :param cluster_code_version: The Service Fabric runtime version of the - cluster. This property can only by set the user when **upgradeMode** is - set to 'Manual'. To get list of available Service Fabric versions for new - clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of - available version for existing clusters use **availableClusterVersions**. - :type cluster_code_version: str + :param add_on_features: The list of add-on features to enable in the + cluster. + :type add_on_features: list[str] :param certificate: The certificate to use for securing the cluster. The certificate provided will be used for node to node security within the cluster, SSL certificate for cluster management endpoint and default admin client. :type certificate: ~azure.mgmt.servicefabric.models.CertificateDescription - :param client_certificate_thumbprints: The list of client certificates - referenced by thumbprint that are allowed to manage the cluster. This will - overwrite the existing list. - :type client_certificate_thumbprints: - list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param certificate_common_names: Describes a list of server certificates + referenced by common name that are used to secure the cluster. + :type certificate_common_names: + ~azure.mgmt.servicefabric.models.ServerCertificateCommonNames :param client_certificate_common_names: The list of client certificates referenced by common name that are allowed to manage the cluster. This will overwrite the existing list. :type client_certificate_common_names: list[~azure.mgmt.servicefabric.models.ClientCertificateCommonName] + :param client_certificate_thumbprints: The list of client certificates + referenced by thumbprint that are allowed to manage the cluster. This will + overwrite the existing list. + :type client_certificate_thumbprints: + list[~azure.mgmt.servicefabric.models.ClientCertificateThumbprint] + :param cluster_code_version: The Service Fabric runtime version of the + cluster. This property can only by set the user when **upgradeMode** is + set to 'Manual'. To get list of available Service Fabric versions for new + clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of + available version for existing clusters use **availableClusterVersions**. + :type cluster_code_version: str + :param event_store_service_enabled: Indicates if the event store service + is enabled. + :type event_store_service_enabled: bool :param fabric_settings: The list of custom fabric settings to configure the cluster. This will overwrite the existing list. :type fabric_settings: list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] - :param reverse_proxy_certificate: The server certificate used by reverse - proxy. - :type reverse_proxy_certificate: - ~azure.mgmt.servicefabric.models.CertificateDescription :param node_types: The list of node types in the cluster. This will overwrite the existing list. :type node_types: list[~azure.mgmt.servicefabric.models.NodeTypeDescription] + :param reliability_level: The reliability level sets the replica set size + of system services. Learn about + [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + - None - Run the System services with a target replica set count of 1. + This should only be used for test clusters. + - Bronze - Run the System services with a target replica set count of 3. + This should only be used for test clusters. + - Silver - Run the System services with a target replica set count of 5. + - Gold - Run the System services with a target replica set count of 7. + - Platinum - Run the System services with a target replica set count of 9. + . Possible values include: 'None', 'Bronze', 'Silver', 'Gold', 'Platinum' + :type reliability_level: str or ~azure.mgmt.servicefabric.models.enum + :param reverse_proxy_certificate: The server certificate used by reverse + proxy. + :type reverse_proxy_certificate: + ~azure.mgmt.servicefabric.models.CertificateDescription :param upgrade_description: The policy to use when upgrading the cluster. :type upgrade_description: ~azure.mgmt.servicefabric.models.ClusterUpgradePolicy - :param add_on_features: The list of add-on features to enable in the - cluster. - :type add_on_features: list[str] + :param upgrade_mode: The upgrade mode of the cluster when new Service + Fabric runtime version is available. + - Automatic - The cluster will be automatically upgraded to the latest + Service Fabric runtime version as soon as it is available. + - Manual - The cluster will not be automatically upgraded to the latest + Service Fabric runtime version. The cluster is upgraded by setting the + **clusterCodeVersion** property in the cluster resource. + . Possible values include: 'Automatic', 'Manual' + :type upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum :param tags: Cluster update parameters :type tags: dict[str, str] """ _attribute_map = { - 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, - 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, - 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, 'certificate': {'key': 'properties.certificate', 'type': 'CertificateDescription'}, - 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'certificate_common_names': {'key': 'properties.certificateCommonNames', 'type': 'ServerCertificateCommonNames'}, 'client_certificate_common_names': {'key': 'properties.clientCertificateCommonNames', 'type': '[ClientCertificateCommonName]'}, + 'client_certificate_thumbprints': {'key': 'properties.clientCertificateThumbprints', 'type': '[ClientCertificateThumbprint]'}, + 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, + 'event_store_service_enabled': {'key': 'properties.eventStoreServiceEnabled', 'type': 'bool'}, 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, - 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, 'node_types': {'key': 'properties.nodeTypes', 'type': '[NodeTypeDescription]'}, + 'reliability_level': {'key': 'properties.reliabilityLevel', 'type': 'str'}, + 'reverse_proxy_certificate': {'key': 'properties.reverseProxyCertificate', 'type': 'CertificateDescription'}, 'upgrade_description': {'key': 'properties.upgradeDescription', 'type': 'ClusterUpgradePolicy'}, - 'add_on_features': {'key': 'properties.addOnFeatures', 'type': '[str]'}, + 'upgrade_mode': {'key': 'properties.upgradeMode', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, } - def __init__(self, *, reliability_level=None, upgrade_mode=None, cluster_code_version: str=None, certificate=None, client_certificate_thumbprints=None, client_certificate_common_names=None, fabric_settings=None, reverse_proxy_certificate=None, node_types=None, upgrade_description=None, add_on_features=None, tags=None, **kwargs) -> None: + def __init__(self, *, add_on_features=None, certificate=None, certificate_common_names=None, client_certificate_common_names=None, client_certificate_thumbprints=None, cluster_code_version: str=None, event_store_service_enabled: bool=None, fabric_settings=None, node_types=None, reliability_level=None, reverse_proxy_certificate=None, upgrade_description=None, upgrade_mode=None, tags=None, **kwargs) -> None: super(ClusterUpdateParameters, self).__init__(**kwargs) - self.reliability_level = reliability_level - self.upgrade_mode = upgrade_mode - self.cluster_code_version = cluster_code_version + self.add_on_features = add_on_features self.certificate = certificate - self.client_certificate_thumbprints = client_certificate_thumbprints + self.certificate_common_names = certificate_common_names self.client_certificate_common_names = client_certificate_common_names + self.client_certificate_thumbprints = client_certificate_thumbprints + self.cluster_code_version = cluster_code_version + self.event_store_service_enabled = event_store_service_enabled self.fabric_settings = fabric_settings - self.reverse_proxy_certificate = reverse_proxy_certificate self.node_types = node_types + self.reliability_level = reliability_level + self.reverse_proxy_certificate = reverse_proxy_certificate self.upgrade_description = upgrade_description - self.add_on_features = add_on_features + self.upgrade_mode = upgrade_mode self.tags = tags diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy.py index 136800c4c0e0..2c12e8b81e8c 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy.py @@ -26,22 +26,29 @@ class ClusterUpgradeDeltaHealthPolicy(Model): :type max_percent_delta_unhealthy_nodes: int :param max_percent_upgrade_domain_delta_unhealthy_nodes: Required. The maximum allowed percentage of upgrade domain nodes health degradation - allowed during cluster upgrades. The delta is measured between the state - of the upgrade domain nodes at the beginning of upgrade and the state of - the upgrade domain nodes at the time of the health evaluation. The check - is performed after every upgrade domain upgrade completion for all - completed upgrade domains to make sure the state of the upgrade domains is - within tolerated limits. + allowed during cluster upgrades. + The delta is measured between the state of the upgrade domain nodes at the + beginning of upgrade and the state of the upgrade domain nodes at the time + of the health evaluation. + The check is performed after every upgrade domain upgrade completion for + all completed upgrade domains to make sure the state of the upgrade + domains is within tolerated limits. :type max_percent_upgrade_domain_delta_unhealthy_nodes: int :param max_percent_delta_unhealthy_applications: Required. The maximum allowed percentage of applications health degradation allowed during - cluster upgrades. The delta is measured between the state of the - applications at the beginning of upgrade and the state of the applications - at the time of the health evaluation. The check is performed after every - upgrade domain upgrade completion to make sure the global state of the - cluster is within tolerated limits. System services are not included in - this. + cluster upgrades. + The delta is measured between the state of the applications at the + beginning of upgrade and the state of the applications at the time of the + health evaluation. + The check is performed after every upgrade domain upgrade completion to + make sure the global state of the cluster is within tolerated limits. + System services are not included in this. :type max_percent_delta_unhealthy_applications: int + :param application_delta_health_policies: Defines the application delta + health policy map used to evaluate the health of an application or one of + its child entities when upgrading the cluster. + :type application_delta_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ApplicationDeltaHealthPolicy] """ _validation = { @@ -54,6 +61,7 @@ class ClusterUpgradeDeltaHealthPolicy(Model): 'max_percent_delta_unhealthy_nodes': {'key': 'maxPercentDeltaUnhealthyNodes', 'type': 'int'}, 'max_percent_upgrade_domain_delta_unhealthy_nodes': {'key': 'maxPercentUpgradeDomainDeltaUnhealthyNodes', 'type': 'int'}, 'max_percent_delta_unhealthy_applications': {'key': 'maxPercentDeltaUnhealthyApplications', 'type': 'int'}, + 'application_delta_health_policies': {'key': 'applicationDeltaHealthPolicies', 'type': '{ApplicationDeltaHealthPolicy}'}, } def __init__(self, **kwargs): @@ -61,3 +69,4 @@ def __init__(self, **kwargs): self.max_percent_delta_unhealthy_nodes = kwargs.get('max_percent_delta_unhealthy_nodes', None) self.max_percent_upgrade_domain_delta_unhealthy_nodes = kwargs.get('max_percent_upgrade_domain_delta_unhealthy_nodes', None) self.max_percent_delta_unhealthy_applications = kwargs.get('max_percent_delta_unhealthy_applications', None) + self.application_delta_health_policies = kwargs.get('application_delta_health_policies', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy_py3.py index d7e1f0fd13d1..0ca8be68f5ca 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_delta_health_policy_py3.py @@ -26,22 +26,29 @@ class ClusterUpgradeDeltaHealthPolicy(Model): :type max_percent_delta_unhealthy_nodes: int :param max_percent_upgrade_domain_delta_unhealthy_nodes: Required. The maximum allowed percentage of upgrade domain nodes health degradation - allowed during cluster upgrades. The delta is measured between the state - of the upgrade domain nodes at the beginning of upgrade and the state of - the upgrade domain nodes at the time of the health evaluation. The check - is performed after every upgrade domain upgrade completion for all - completed upgrade domains to make sure the state of the upgrade domains is - within tolerated limits. + allowed during cluster upgrades. + The delta is measured between the state of the upgrade domain nodes at the + beginning of upgrade and the state of the upgrade domain nodes at the time + of the health evaluation. + The check is performed after every upgrade domain upgrade completion for + all completed upgrade domains to make sure the state of the upgrade + domains is within tolerated limits. :type max_percent_upgrade_domain_delta_unhealthy_nodes: int :param max_percent_delta_unhealthy_applications: Required. The maximum allowed percentage of applications health degradation allowed during - cluster upgrades. The delta is measured between the state of the - applications at the beginning of upgrade and the state of the applications - at the time of the health evaluation. The check is performed after every - upgrade domain upgrade completion to make sure the global state of the - cluster is within tolerated limits. System services are not included in - this. + cluster upgrades. + The delta is measured between the state of the applications at the + beginning of upgrade and the state of the applications at the time of the + health evaluation. + The check is performed after every upgrade domain upgrade completion to + make sure the global state of the cluster is within tolerated limits. + System services are not included in this. :type max_percent_delta_unhealthy_applications: int + :param application_delta_health_policies: Defines the application delta + health policy map used to evaluate the health of an application or one of + its child entities when upgrading the cluster. + :type application_delta_health_policies: dict[str, + ~azure.mgmt.servicefabric.models.ApplicationDeltaHealthPolicy] """ _validation = { @@ -54,10 +61,12 @@ class ClusterUpgradeDeltaHealthPolicy(Model): 'max_percent_delta_unhealthy_nodes': {'key': 'maxPercentDeltaUnhealthyNodes', 'type': 'int'}, 'max_percent_upgrade_domain_delta_unhealthy_nodes': {'key': 'maxPercentUpgradeDomainDeltaUnhealthyNodes', 'type': 'int'}, 'max_percent_delta_unhealthy_applications': {'key': 'maxPercentDeltaUnhealthyApplications', 'type': 'int'}, + 'application_delta_health_policies': {'key': 'applicationDeltaHealthPolicies', 'type': '{ApplicationDeltaHealthPolicy}'}, } - def __init__(self, *, max_percent_delta_unhealthy_nodes: int, max_percent_upgrade_domain_delta_unhealthy_nodes: int, max_percent_delta_unhealthy_applications: int, **kwargs) -> None: + def __init__(self, *, max_percent_delta_unhealthy_nodes: int, max_percent_upgrade_domain_delta_unhealthy_nodes: int, max_percent_delta_unhealthy_applications: int, application_delta_health_policies=None, **kwargs) -> None: super(ClusterUpgradeDeltaHealthPolicy, self).__init__(**kwargs) self.max_percent_delta_unhealthy_nodes = max_percent_delta_unhealthy_nodes self.max_percent_upgrade_domain_delta_unhealthy_nodes = max_percent_upgrade_domain_delta_unhealthy_nodes self.max_percent_delta_unhealthy_applications = max_percent_delta_unhealthy_applications + self.application_delta_health_policies = application_delta_health_policies diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy.py index e7e0dc651a37..dd9599c097e3 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy.py @@ -22,7 +22,7 @@ class ClusterUpgradePolicy(Model): only changes configuration or data). :type force_restart: bool :param upgrade_replica_set_check_timeout: Required. The maximum amount of - time to block processing of an upgrade domain and revent loss of + time to block processing of an upgrade domain and prevent loss of availability when there are unexpected issues. When this timeout expires, processing of the upgrade domain will proceed regardless of availability loss issues. The timeout is reset at the start of each upgrade domain. The @@ -53,8 +53,8 @@ class ClusterUpgradePolicy(Model): :param health_policy: Required. The cluster health policy used when upgrading the cluster. :type health_policy: ~azure.mgmt.servicefabric.models.ClusterHealthPolicy - :param delta_health_policy: The delta health policy used when upgrading - the cluster. + :param delta_health_policy: The cluster delta health policy used when + upgrading the cluster. :type delta_health_policy: ~azure.mgmt.servicefabric.models.ClusterUpgradeDeltaHealthPolicy """ diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy_py3.py index fa52284435be..83f5ab73ab84 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/cluster_upgrade_policy_py3.py @@ -22,7 +22,7 @@ class ClusterUpgradePolicy(Model): only changes configuration or data). :type force_restart: bool :param upgrade_replica_set_check_timeout: Required. The maximum amount of - time to block processing of an upgrade domain and revent loss of + time to block processing of an upgrade domain and prevent loss of availability when there are unexpected issues. When this timeout expires, processing of the upgrade domain will proceed regardless of availability loss issues. The timeout is reset at the start of each upgrade domain. The @@ -53,8 +53,8 @@ class ClusterUpgradePolicy(Model): :param health_policy: Required. The cluster health policy used when upgrading the cluster. :type health_policy: ~azure.mgmt.servicefabric.models.ClusterHealthPolicy - :param delta_health_policy: The delta health policy used when upgrading - the cluster. + :param delta_health_policy: The cluster delta health policy used when + upgrading the cluster. :type delta_health_policy: ~azure.mgmt.servicefabric.models.ClusterUpgradeDeltaHealthPolicy """ diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model.py index 5090e6311ce2..e80bc33596d8 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model.py @@ -14,23 +14,19 @@ class ErrorModel(Model): - """The error details. + """The structure of the error. - :param code: The error code. - :type code: str - :param message: The error message. - :type message: str + :param error: The error details. + :type error: ~azure.mgmt.servicefabric.models.ErrorModelError """ _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, + 'error': {'key': 'error', 'type': 'ErrorModelError'}, } def __init__(self, **kwargs): super(ErrorModel, self).__init__(**kwargs) - self.code = kwargs.get('code', None) - self.message = kwargs.get('message', None) + self.error = kwargs.get('error', None) class ErrorModelException(HttpOperationError): diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_list.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_error.py similarity index 58% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_list.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_error.py index 030082a2c0e6..97cef377da79 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_list.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_error.py @@ -12,17 +12,21 @@ from msrest.serialization import Model -class VersionResourceList(Model): - """The list of version resources for the specified application type name. +class ErrorModelError(Model): + """The error details. - :param value: - :type value: list[~azure.mgmt.servicefabric.models.VersionResource] + :param code: The error code. + :type code: str + :param message: The error message. + :type message: str """ _attribute_map = { - 'value': {'key': 'value', 'type': '[VersionResource]'}, + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, } def __init__(self, **kwargs): - super(VersionResourceList, self).__init__(**kwargs) - self.value = kwargs.get('value', None) + super(ErrorModelError, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_list_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_error_py3.py similarity index 54% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_list_py3.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_error_py3.py index fef031e79e1b..361be795bec5 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/version_resource_list_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_error_py3.py @@ -12,17 +12,21 @@ from msrest.serialization import Model -class VersionResourceList(Model): - """The list of version resources for the specified application type name. +class ErrorModelError(Model): + """The error details. - :param value: - :type value: list[~azure.mgmt.servicefabric.models.VersionResource] + :param code: The error code. + :type code: str + :param message: The error message. + :type message: str """ _attribute_map = { - 'value': {'key': 'value', 'type': '[VersionResource]'}, + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, } - def __init__(self, *, value=None, **kwargs) -> None: - super(VersionResourceList, self).__init__(**kwargs) - self.value = value + def __init__(self, *, code: str=None, message: str=None, **kwargs) -> None: + super(ErrorModelError, self).__init__(**kwargs) + self.code = code + self.message = message diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_py3.py index f62ee7de354d..4a77c32d7f59 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/error_model_py3.py @@ -14,23 +14,19 @@ class ErrorModel(Model): - """The error details. + """The structure of the error. - :param code: The error code. - :type code: str - :param message: The error message. - :type message: str + :param error: The error details. + :type error: ~azure.mgmt.servicefabric.models.ErrorModelError """ _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, + 'error': {'key': 'error', 'type': 'ErrorModelError'}, } - def __init__(self, *, code: str=None, message: str=None, **kwargs) -> None: + def __init__(self, *, error=None, **kwargs) -> None: super(ErrorModel, self).__init__(**kwargs) - self.code = code - self.message = message + self.error = error class ErrorModelException(HttpOperationError): diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description.py index 0d58fa2ae8df..4b6c9c8bdb2c 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description.py @@ -33,7 +33,7 @@ class NamedPartitionSchemeDescription(PartitionSchemeDescription): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, 'count': {'key': 'Count', 'type': 'int'}, 'names': {'key': 'Names', 'type': '[str]'}, } diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description_py3.py index d50a2fbb2a93..99888733cd58 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/named_partition_scheme_description_py3.py @@ -33,7 +33,7 @@ class NamedPartitionSchemeDescription(PartitionSchemeDescription): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, 'count': {'key': 'Count', 'type': 'int'}, 'names': {'key': 'Names', 'type': '[str]'}, } diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description.py index b79042bc0d81..26d65f46d00b 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description.py @@ -34,14 +34,22 @@ class NodeTypeDescription(Model): :param http_gateway_endpoint_port: Required. The HTTP cluster management endpoint port. :type http_gateway_endpoint_port: int - :param durability_level: Possible values include: 'Bronze', 'Silver', - 'Gold' + :param durability_level: The durability level of the node type. Learn + about + [DurabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + - Bronze - No privileges. This is the default. + - Silver - The infrastructure jobs can be paused for a duration of 10 + minutes per UD. + - Gold - The infrastructure jobs can be paused for a duration of 2 hours + per UD. Gold durability can be enabled only on full node VM skus like + D15_V2, G5 etc. + . Possible values include: 'Bronze', 'Silver', 'Gold' :type durability_level: str or ~azure.mgmt.servicefabric.models.enum :param application_ports: The range of ports from which cluster assigned port to Service Fabric applications. :type application_ports: ~azure.mgmt.servicefabric.models.EndpointRangeDescription - :param ephemeral_ports: The range of empheral ports that nodes in this + :param ephemeral_ports: The range of ephemeral ports that nodes in this node type should be configured with. :type ephemeral_ports: ~azure.mgmt.servicefabric.models.EndpointRangeDescription diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description_py3.py index cf04572b9ae7..b3db84d6bb1e 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/node_type_description_py3.py @@ -34,14 +34,22 @@ class NodeTypeDescription(Model): :param http_gateway_endpoint_port: Required. The HTTP cluster management endpoint port. :type http_gateway_endpoint_port: int - :param durability_level: Possible values include: 'Bronze', 'Silver', - 'Gold' + :param durability_level: The durability level of the node type. Learn + about + [DurabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + - Bronze - No privileges. This is the default. + - Silver - The infrastructure jobs can be paused for a duration of 10 + minutes per UD. + - Gold - The infrastructure jobs can be paused for a duration of 2 hours + per UD. Gold durability can be enabled only on full node VM skus like + D15_V2, G5 etc. + . Possible values include: 'Bronze', 'Silver', 'Gold' :type durability_level: str or ~azure.mgmt.servicefabric.models.enum :param application_ports: The range of ports from which cluster assigned port to Service Fabric applications. :type application_ports: ~azure.mgmt.servicefabric.models.EndpointRangeDescription - :param ephemeral_ports: The range of empheral ports that nodes in this + :param ephemeral_ports: The range of ephemeral ports that nodes in this node type should be configured with. :type ephemeral_ports: ~azure.mgmt.servicefabric.models.EndpointRangeDescription diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description.py index 205c3d5184d2..68d09371c94a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description.py @@ -31,7 +31,7 @@ class PartitionSchemeDescription(Model): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, } _subtype_map = { diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description_py3.py index 88805c409cee..236ee1a41d7b 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/partition_scheme_description_py3.py @@ -31,7 +31,7 @@ class PartitionSchemeDescription(Model): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, } _subtype_map = { diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource.py index 7bb6ef812886..11bb6788cf94 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource.py @@ -18,23 +18,25 @@ class ProxyResource(Model): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, } _attribute_map = { @@ -42,6 +44,8 @@ class ProxyResource(Model): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): @@ -50,3 +54,5 @@ def __init__(self, **kwargs): self.name = None self.type = None self.location = kwargs.get('location', None) + self.tags = kwargs.get('tags', None) + self.etag = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource_py3.py index 0ecdce096add..090e51be9879 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/proxy_resource_py3.py @@ -18,23 +18,25 @@ class ProxyResource(Model): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, } _attribute_map = { @@ -42,11 +44,15 @@ class ProxyResource(Model): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, location: str, **kwargs) -> None: + def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: super(ProxyResource, self).__init__(**kwargs) self.id = None self.name = None self.type = None self.location = location + self.tags = tags + self.etag = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource.py index a4308809fa31..f7992d5590bd 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource.py @@ -20,16 +20,18 @@ class Resource(Model): All required parameters must be populated in order to send to Azure. - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Required. Azure resource location. :type location: str - :param tags: Resource tags. + :param tags: Azure resource tags. :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str """ _validation = { @@ -37,6 +39,7 @@ class Resource(Model): 'name': {'readonly': True}, 'type': {'readonly': True}, 'location': {'required': True}, + 'etag': {'readonly': True}, } _attribute_map = { @@ -45,6 +48,7 @@ class Resource(Model): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): @@ -54,3 +58,4 @@ def __init__(self, **kwargs): self.type = None self.location = kwargs.get('location', None) self.tags = kwargs.get('tags', None) + self.etag = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource_py3.py index 8e6adb96fdae..5cec5515a089 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/resource_py3.py @@ -20,16 +20,18 @@ class Resource(Model): All required parameters must be populated in order to send to Azure. - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Required. Azure resource location. :type location: str - :param tags: Resource tags. + :param tags: Azure resource tags. :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str """ _validation = { @@ -37,6 +39,7 @@ class Resource(Model): 'name': {'readonly': True}, 'type': {'readonly': True}, 'location': {'required': True}, + 'etag': {'readonly': True}, } _attribute_map = { @@ -45,6 +48,7 @@ class Resource(Model): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, *, location: str, tags=None, **kwargs) -> None: @@ -54,3 +58,4 @@ def __init__(self, *, location: str, tags=None, **kwargs) -> None: self.type = None self.location = location self.tags = tags + self.etag = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/rolling_upgrade_monitoring_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/rolling_upgrade_monitoring_policy.py deleted file mode 100644 index 81c84e13931a..000000000000 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/rolling_upgrade_monitoring_policy.py +++ /dev/null @@ -1,44 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class RollingUpgradeMonitoringPolicy(Model): - """The policy used for monitoring the application upgrade. - - :param health_check_wait_duration: - :type health_check_wait_duration: str - :param health_check_stable_duration: - :type health_check_stable_duration: str - :param health_check_retry_timeout: - :type health_check_retry_timeout: str - :param upgrade_timeout: - :type upgrade_timeout: str - :param upgrade_domain_timeout: - :type upgrade_domain_timeout: str - """ - - _attribute_map = { - 'health_check_wait_duration': {'key': 'healthCheckWaitDuration', 'type': 'str'}, - 'health_check_stable_duration': {'key': 'healthCheckStableDuration', 'type': 'str'}, - 'health_check_retry_timeout': {'key': 'healthCheckRetryTimeout', 'type': 'str'}, - 'upgrade_timeout': {'key': 'upgradeTimeout', 'type': 'str'}, - 'upgrade_domain_timeout': {'key': 'upgradeDomainTimeout', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(RollingUpgradeMonitoringPolicy, self).__init__(**kwargs) - self.health_check_wait_duration = kwargs.get('health_check_wait_duration', None) - self.health_check_stable_duration = kwargs.get('health_check_stable_duration', None) - self.health_check_retry_timeout = kwargs.get('health_check_retry_timeout', None) - self.upgrade_timeout = kwargs.get('upgrade_timeout', None) - self.upgrade_domain_timeout = kwargs.get('upgrade_domain_timeout', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/rolling_upgrade_monitoring_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/rolling_upgrade_monitoring_policy_py3.py deleted file mode 100644 index dee03b1217e6..000000000000 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/rolling_upgrade_monitoring_policy_py3.py +++ /dev/null @@ -1,44 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class RollingUpgradeMonitoringPolicy(Model): - """The policy used for monitoring the application upgrade. - - :param health_check_wait_duration: - :type health_check_wait_duration: str - :param health_check_stable_duration: - :type health_check_stable_duration: str - :param health_check_retry_timeout: - :type health_check_retry_timeout: str - :param upgrade_timeout: - :type upgrade_timeout: str - :param upgrade_domain_timeout: - :type upgrade_domain_timeout: str - """ - - _attribute_map = { - 'health_check_wait_duration': {'key': 'healthCheckWaitDuration', 'type': 'str'}, - 'health_check_stable_duration': {'key': 'healthCheckStableDuration', 'type': 'str'}, - 'health_check_retry_timeout': {'key': 'healthCheckRetryTimeout', 'type': 'str'}, - 'upgrade_timeout': {'key': 'upgradeTimeout', 'type': 'str'}, - 'upgrade_domain_timeout': {'key': 'upgradeDomainTimeout', 'type': 'str'}, - } - - def __init__(self, *, health_check_wait_duration: str=None, health_check_stable_duration: str=None, health_check_retry_timeout: str=None, upgrade_timeout: str=None, upgrade_domain_timeout: str=None, **kwargs) -> None: - super(RollingUpgradeMonitoringPolicy, self).__init__(**kwargs) - self.health_check_wait_duration = health_check_wait_duration - self.health_check_stable_duration = health_check_stable_duration - self.health_check_retry_timeout = health_check_retry_timeout - self.upgrade_timeout = upgrade_timeout - self.upgrade_domain_timeout = upgrade_domain_timeout diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_name.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_name.py new file mode 100644 index 000000000000..1a614ee4e81f --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_name.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ServerCertificateCommonName(Model): + """Describes the server certificate details using common name. + + All required parameters must be populated in order to send to Azure. + + :param certificate_common_name: Required. The common name of the server + certificate. + :type certificate_common_name: str + :param certificate_issuer_thumbprint: Required. The issuer thumbprint of + the server certificate. + :type certificate_issuer_thumbprint: str + """ + + _validation = { + 'certificate_common_name': {'required': True}, + 'certificate_issuer_thumbprint': {'required': True}, + } + + _attribute_map = { + 'certificate_common_name': {'key': 'certificateCommonName', 'type': 'str'}, + 'certificate_issuer_thumbprint': {'key': 'certificateIssuerThumbprint', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ServerCertificateCommonName, self).__init__(**kwargs) + self.certificate_common_name = kwargs.get('certificate_common_name', None) + self.certificate_issuer_thumbprint = kwargs.get('certificate_issuer_thumbprint', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_name_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_name_py3.py new file mode 100644 index 000000000000..2af9f71a7834 --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_name_py3.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ServerCertificateCommonName(Model): + """Describes the server certificate details using common name. + + All required parameters must be populated in order to send to Azure. + + :param certificate_common_name: Required. The common name of the server + certificate. + :type certificate_common_name: str + :param certificate_issuer_thumbprint: Required. The issuer thumbprint of + the server certificate. + :type certificate_issuer_thumbprint: str + """ + + _validation = { + 'certificate_common_name': {'required': True}, + 'certificate_issuer_thumbprint': {'required': True}, + } + + _attribute_map = { + 'certificate_common_name': {'key': 'certificateCommonName', 'type': 'str'}, + 'certificate_issuer_thumbprint': {'key': 'certificateIssuerThumbprint', 'type': 'str'}, + } + + def __init__(self, *, certificate_common_name: str, certificate_issuer_thumbprint: str, **kwargs) -> None: + super(ServerCertificateCommonName, self).__init__(**kwargs) + self.certificate_common_name = certificate_common_name + self.certificate_issuer_thumbprint = certificate_issuer_thumbprint diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_names.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_names.py new file mode 100644 index 000000000000..332415464c93 --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_names.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ServerCertificateCommonNames(Model): + """Describes a list of server certificates referenced by common name that are + used to secure the cluster. + + :param common_names: The list of server certificates referenced by common + name that are used to secure the cluster. + :type common_names: + list[~azure.mgmt.servicefabric.models.ServerCertificateCommonName] + :param x509_store_name: The local certificate store location. Possible + values include: 'AddressBook', 'AuthRoot', 'CertificateAuthority', + 'Disallowed', 'My', 'Root', 'TrustedPeople', 'TrustedPublisher' + :type x509_store_name: str or ~azure.mgmt.servicefabric.models.enum + """ + + _attribute_map = { + 'common_names': {'key': 'commonNames', 'type': '[ServerCertificateCommonName]'}, + 'x509_store_name': {'key': 'x509StoreName', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ServerCertificateCommonNames, self).__init__(**kwargs) + self.common_names = kwargs.get('common_names', None) + self.x509_store_name = kwargs.get('x509_store_name', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_names_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_names_py3.py new file mode 100644 index 000000000000..e9e098c3c93a --- /dev/null +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/server_certificate_common_names_py3.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ServerCertificateCommonNames(Model): + """Describes a list of server certificates referenced by common name that are + used to secure the cluster. + + :param common_names: The list of server certificates referenced by common + name that are used to secure the cluster. + :type common_names: + list[~azure.mgmt.servicefabric.models.ServerCertificateCommonName] + :param x509_store_name: The local certificate store location. Possible + values include: 'AddressBook', 'AuthRoot', 'CertificateAuthority', + 'Disallowed', 'My', 'Root', 'TrustedPeople', 'TrustedPublisher' + :type x509_store_name: str or ~azure.mgmt.servicefabric.models.enum + """ + + _attribute_map = { + 'common_names': {'key': 'commonNames', 'type': '[ServerCertificateCommonName]'}, + 'x509_store_name': {'key': 'x509StoreName', 'type': 'str'}, + } + + def __init__(self, *, common_names=None, x509_store_name=None, **kwargs) -> None: + super(ServerCertificateCommonNames, self).__init__(**kwargs) + self.common_names = common_names + self.x509_store_name = x509_store_name diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description.py index 18e7c11180d1..9ce98910384a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description.py @@ -17,10 +17,14 @@ class ServiceCorrelationDescription(Model): All required parameters must be populated in order to send to Azure. - :param scheme: Required. Possible values include: 'Invalid', 'Affinity', + :param scheme: Required. The ServiceCorrelationScheme which describes the + relationship between this service and the service specified via + ServiceName. Possible values include: 'Invalid', 'Affinity', 'AlignedAffinity', 'NonAlignedAffinity' - :type scheme: str or ~azure.mgmt.servicefabric.models.enum - :param service_name: Required. + :type scheme: str or + ~azure.mgmt.servicefabric.models.ServiceCorrelationScheme + :param service_name: Required. The name of the service that the + correlation relationship is established with. :type service_name: str """ @@ -30,8 +34,8 @@ class ServiceCorrelationDescription(Model): } _attribute_map = { - 'scheme': {'key': 'Scheme', 'type': 'str'}, - 'service_name': {'key': 'ServiceName', 'type': 'str'}, + 'scheme': {'key': 'scheme', 'type': 'str'}, + 'service_name': {'key': 'serviceName', 'type': 'str'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description_py3.py index 59bf0b8c5ea3..5efaf9a713dd 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_correlation_description_py3.py @@ -17,10 +17,14 @@ class ServiceCorrelationDescription(Model): All required parameters must be populated in order to send to Azure. - :param scheme: Required. Possible values include: 'Invalid', 'Affinity', + :param scheme: Required. The ServiceCorrelationScheme which describes the + relationship between this service and the service specified via + ServiceName. Possible values include: 'Invalid', 'Affinity', 'AlignedAffinity', 'NonAlignedAffinity' - :type scheme: str or ~azure.mgmt.servicefabric.models.enum - :param service_name: Required. + :type scheme: str or + ~azure.mgmt.servicefabric.models.ServiceCorrelationScheme + :param service_name: Required. The name of the service that the + correlation relationship is established with. :type service_name: str """ @@ -30,8 +34,8 @@ class ServiceCorrelationDescription(Model): } _attribute_map = { - 'scheme': {'key': 'Scheme', 'type': 'str'}, - 'service_name': {'key': 'ServiceName', 'type': 'str'}, + 'scheme': {'key': 'scheme', 'type': 'str'}, + 'service_name': {'key': 'serviceName', 'type': 'str'}, } def __init__(self, *, scheme, service_name: str, **kwargs) -> None: diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_fabric_management_client_enums.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_fabric_management_client_enums.py index 3680f67462cf..166593097003 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_fabric_management_client_enums.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_fabric_management_client_enums.py @@ -18,3 +18,64 @@ class ProvisioningState(str, Enum): succeeded = "Succeeded" failed = "Failed" canceled = "Canceled" + + +class ArmUpgradeFailureAction(str, Enum): + + rollback = "Rollback" #: Indicates that a rollback of the upgrade will be performed by Service Fabric if the upgrade fails. + manual = "Manual" #: Indicates that a manual repair will need to be performed by the administrator if the upgrade fails. Service Fabric will not proceed to the next upgrade domain automatically. + + +class ServiceCorrelationScheme(str, Enum): + + invalid = "Invalid" #: An invalid correlation scheme. Cannot be used. The value is zero. + affinity = "Affinity" #: Indicates that this service has an affinity relationship with another service. Provided for backwards compatibility, consider preferring the Aligned or NonAlignedAffinity options. The value is 1. + aligned_affinity = "AlignedAffinity" #: Aligned affinity ensures that the primaries of the partitions of the affinitized services are collocated on the same nodes. This is the default and is the same as selecting the Affinity scheme. The value is 2. + non_aligned_affinity = "NonAlignedAffinity" #: Non-Aligned affinity guarantees that all replicas of each service will be placed on the same nodes. Unlike Aligned Affinity, this does not guarantee that replicas of particular role will be collocated. The value is 3. + + +class MoveCost(str, Enum): + + zero = "Zero" #: Zero move cost. This value is zero. + low = "Low" #: Specifies the move cost of the service as Low. The value is 1. + medium = "Medium" #: Specifies the move cost of the service as Medium. The value is 2. + high = "High" #: Specifies the move cost of the service as High. The value is 3. + + +class PartitionScheme(str, Enum): + + invalid = "Invalid" #: Indicates the partition kind is invalid. All Service Fabric enumerations have the invalid type. The value is zero. + singleton = "Singleton" #: Indicates that the partition is based on string names, and is a SingletonPartitionSchemeDescription object, The value is 1. + uniform_int64_range = "UniformInt64Range" #: Indicates that the partition is based on Int64 key ranges, and is a UniformInt64RangePartitionSchemeDescription object. The value is 2. + named = "Named" #: Indicates that the partition is based on string names, and is a NamedPartitionSchemeDescription object. The value is 3 + + +class ServiceKind(str, Enum): + + invalid = "Invalid" #: Indicates the service kind is invalid. All Service Fabric enumerations have the invalid type. The value is zero. + stateless = "Stateless" #: Does not use Service Fabric to make its state highly available or reliable. The value is 1. + stateful = "Stateful" #: Uses Service Fabric to make its state or part of its state highly available and reliable. The value is 2. + + +class ServiceLoadMetricWeight(str, Enum): + + zero = "Zero" #: Disables resource balancing for this metric. This value is zero. + low = "Low" #: Specifies the metric weight of the service load as Low. The value is 1. + medium = "Medium" #: Specifies the metric weight of the service load as Medium. The value is 2. + high = "High" #: Specifies the metric weight of the service load as High. The value is 3. + + +class ServicePlacementPolicyType(str, Enum): + + invalid = "Invalid" #: Indicates the type of the placement policy is invalid. All Service Fabric enumerations have the invalid type. The value is zero. + invalid_domain = "InvalidDomain" #: Indicates that the ServicePlacementPolicyDescription is of type ServicePlacementInvalidDomainPolicyDescription, which indicates that a particular fault or upgrade domain cannot be used for placement of this service. The value is 1. + required_domain = "RequiredDomain" #: Indicates that the ServicePlacementPolicyDescription is of type ServicePlacementRequireDomainDistributionPolicyDescription indicating that the replicas of the service must be placed in a specific domain. The value is 2. + preferred_primary_domain = "PreferredPrimaryDomain" #: Indicates that the ServicePlacementPolicyDescription is of type ServicePlacementPreferPrimaryDomainPolicyDescription, which indicates that if possible the Primary replica for the partitions of the service should be located in a particular domain as an optimization. The value is 3. + required_domain_distribution = "RequiredDomainDistribution" #: Indicates that the ServicePlacementPolicyDescription is of type ServicePlacementRequireDomainDistributionPolicyDescription, indicating that the system will disallow placement of any two replicas from the same partition in the same domain at any time. The value is 4. + non_partially_place_service = "NonPartiallyPlaceService" #: Indicates that the ServicePlacementPolicyDescription is of type ServicePlacementNonPartiallyPlaceServicePolicyDescription, which indicates that if possible all replicas of a particular partition of the service should be placed atomically. The value is 5. + + +class ArmServicePackageActivationMode(str, Enum): + + shared_process = "SharedProcess" #: Indicates the application package activation mode will use shared process. + exclusive_process = "ExclusiveProcess" #: Indicates the application package activation mode will use exclusive process. diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description.py index 644fad3feaec..f3a5e9e80079 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description.py @@ -22,8 +22,11 @@ class ServiceLoadMetricDescription(Model): that is specified in Name exactly. Note that metric names are case sensitive. :type name: str - :param weight: Possible values include: 'Zero', 'Low', 'Medium', 'High' - :type weight: str or ~azure.mgmt.servicefabric.models.enum + :param weight: The service load metric relative weight, compared to other + metrics configured for this service, as a number. Possible values include: + 'Zero', 'Low', 'Medium', 'High' + :type weight: str or + ~azure.mgmt.servicefabric.models.ServiceLoadMetricWeight :param primary_default_load: Used only for Stateful services. The default amount of load, as a number, that this service creates for this metric when it is a Primary replica. @@ -42,11 +45,11 @@ class ServiceLoadMetricDescription(Model): } _attribute_map = { - 'name': {'key': 'Name', 'type': 'str'}, - 'weight': {'key': 'Weight', 'type': 'str'}, - 'primary_default_load': {'key': 'PrimaryDefaultLoad', 'type': 'int'}, - 'secondary_default_load': {'key': 'SecondaryDefaultLoad', 'type': 'int'}, - 'default_load': {'key': 'DefaultLoad', 'type': 'int'}, + 'name': {'key': 'name', 'type': 'str'}, + 'weight': {'key': 'weight', 'type': 'str'}, + 'primary_default_load': {'key': 'primaryDefaultLoad', 'type': 'int'}, + 'secondary_default_load': {'key': 'secondaryDefaultLoad', 'type': 'int'}, + 'default_load': {'key': 'defaultLoad', 'type': 'int'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description_py3.py index 01f00bde3e5f..b4e977b5ed7f 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_load_metric_description_py3.py @@ -22,8 +22,11 @@ class ServiceLoadMetricDescription(Model): that is specified in Name exactly. Note that metric names are case sensitive. :type name: str - :param weight: Possible values include: 'Zero', 'Low', 'Medium', 'High' - :type weight: str or ~azure.mgmt.servicefabric.models.enum + :param weight: The service load metric relative weight, compared to other + metrics configured for this service, as a number. Possible values include: + 'Zero', 'Low', 'Medium', 'High' + :type weight: str or + ~azure.mgmt.servicefabric.models.ServiceLoadMetricWeight :param primary_default_load: Used only for Stateful services. The default amount of load, as a number, that this service creates for this metric when it is a Primary replica. @@ -42,11 +45,11 @@ class ServiceLoadMetricDescription(Model): } _attribute_map = { - 'name': {'key': 'Name', 'type': 'str'}, - 'weight': {'key': 'Weight', 'type': 'str'}, - 'primary_default_load': {'key': 'PrimaryDefaultLoad', 'type': 'int'}, - 'secondary_default_load': {'key': 'SecondaryDefaultLoad', 'type': 'int'}, - 'default_load': {'key': 'DefaultLoad', 'type': 'int'}, + 'name': {'key': 'name', 'type': 'str'}, + 'weight': {'key': 'weight', 'type': 'str'}, + 'primary_default_load': {'key': 'primaryDefaultLoad', 'type': 'int'}, + 'secondary_default_load': {'key': 'secondaryDefaultLoad', 'type': 'int'}, + 'default_load': {'key': 'defaultLoad', 'type': 'int'}, } def __init__(self, *, name: str, weight=None, primary_default_load: int=None, secondary_default_load: int=None, default_load: int=None, **kwargs) -> None: diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource.py index 15867ed339c7..9f0a6cad202f 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource.py @@ -18,49 +18,58 @@ class ServiceResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :param placement_constraints: The placement constraints as a string. Placement constraints are boolean expressions on node properties and allow for restricting a service to particular nodes based on the service requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'provisioning_state': {'readonly': True}, } @@ -69,6 +78,8 @@ class ServiceResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'placement_constraints': {'key': 'properties.placementConstraints', 'type': 'str'}, 'correlation_scheme': {'key': 'properties.correlationScheme', 'type': '[ServiceCorrelationDescription]'}, 'service_load_metrics': {'key': 'properties.serviceLoadMetrics', 'type': '[ServiceLoadMetricDescription]'}, @@ -77,6 +88,7 @@ class ServiceResource(ProxyResource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'properties.serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'properties.partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'properties.servicePackageActivationMode', 'type': 'str'}, } def __init__(self, **kwargs): @@ -89,3 +101,4 @@ def __init__(self, **kwargs): self.provisioning_state = None self.service_type_name = kwargs.get('service_type_name', None) self.partition_description = kwargs.get('partition_description', None) + self.service_package_activation_mode = kwargs.get('service_package_activation_mode', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list.py index 8871691fa46f..f4c120505a4b 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list.py @@ -15,14 +15,26 @@ class ServiceResourceList(Model): """The list of service resources. + Variables are only populated by the server, and will be ignored when + sending a request. + :param value: :type value: list[~azure.mgmt.servicefabric.models.ServiceResource] + :ivar next_link: URL to get the next set of service list results if there + are any. + :vartype next_link: str """ + _validation = { + 'next_link': {'readonly': True}, + } + _attribute_map = { 'value': {'key': 'value', 'type': '[ServiceResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, } def __init__(self, **kwargs): super(ServiceResourceList, self).__init__(**kwargs) self.value = kwargs.get('value', None) + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list_py3.py index dd78f257dc14..92c003c361d9 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_list_py3.py @@ -15,14 +15,26 @@ class ServiceResourceList(Model): """The list of service resources. + Variables are only populated by the server, and will be ignored when + sending a request. + :param value: :type value: list[~azure.mgmt.servicefabric.models.ServiceResource] + :ivar next_link: URL to get the next set of service list results if there + are any. + :vartype next_link: str """ + _validation = { + 'next_link': {'readonly': True}, + } + _attribute_map = { 'value': {'key': 'value', 'type': '[ServiceResource]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, } def __init__(self, *, value=None, **kwargs) -> None: super(ServiceResourceList, self).__init__(**kwargs) self.value = value + self.next_link = None diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties.py similarity index 68% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties.py index cce0adb6fb4a..6b08bd8c75e8 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties.py @@ -9,14 +9,14 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties_base import ServicePropertiesBase +from .service_resource_properties_base import ServiceResourcePropertiesBase -class ServiceProperties(ServicePropertiesBase): +class ServiceResourceProperties(ServiceResourcePropertiesBase): """The service resource properties. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: StatelessServiceProperties, StatefulServiceProperties + sub-classes are: StatefulServiceProperties, StatelessServiceProperties Variables are only populated by the server, and will be ignored when sending a request. @@ -29,26 +29,33 @@ class ServiceProperties(ServicePropertiesBase): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode :param service_kind: Required. Constant filled by server. :type service_kind: str """ @@ -67,17 +74,19 @@ class ServiceProperties(ServicePropertiesBase): 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'servicePackageActivationMode', 'type': 'str'}, 'service_kind': {'key': 'serviceKind', 'type': 'str'}, } _subtype_map = { - 'service_kind': {'Stateless': 'StatelessServiceProperties', 'Stateful': 'StatefulServiceProperties'} + 'service_kind': {'Stateful': 'StatefulServiceProperties', 'Stateless': 'StatelessServiceProperties'} } def __init__(self, **kwargs): - super(ServiceProperties, self).__init__(**kwargs) + super(ServiceResourceProperties, self).__init__(**kwargs) self.provisioning_state = None self.service_type_name = kwargs.get('service_type_name', None) self.partition_description = kwargs.get('partition_description', None) + self.service_package_activation_mode = kwargs.get('service_package_activation_mode', None) self.service_kind = None - self.service_kind = 'ServiceProperties' + self.service_kind = 'ServiceResourceProperties' diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_base.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_base.py similarity index 78% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_base.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_base.py index 0a0f61033adb..e9b99727047a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_base.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_base.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class ServicePropertiesBase(Model): +class ServiceResourcePropertiesBase(Model): """The common service resource properties. :param placement_constraints: The placement constraints as a string. @@ -21,18 +21,21 @@ class ServicePropertiesBase(Model): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost """ _attribute_map = { @@ -44,7 +47,7 @@ class ServicePropertiesBase(Model): } def __init__(self, **kwargs): - super(ServicePropertiesBase, self).__init__(**kwargs) + super(ServiceResourcePropertiesBase, self).__init__(**kwargs) self.placement_constraints = kwargs.get('placement_constraints', None) self.correlation_scheme = kwargs.get('correlation_scheme', None) self.service_load_metrics = kwargs.get('service_load_metrics', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_base_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_base_py3.py similarity index 79% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_base_py3.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_base_py3.py index 776e70fe3e63..b9960192295a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_base_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_base_py3.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class ServicePropertiesBase(Model): +class ServiceResourcePropertiesBase(Model): """The common service resource properties. :param placement_constraints: The placement constraints as a string. @@ -21,18 +21,21 @@ class ServicePropertiesBase(Model): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost """ _attribute_map = { @@ -44,7 +47,7 @@ class ServicePropertiesBase(Model): } def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, **kwargs) -> None: - super(ServicePropertiesBase, self).__init__(**kwargs) + super(ServiceResourcePropertiesBase, self).__init__(**kwargs) self.placement_constraints = placement_constraints self.correlation_scheme = correlation_scheme self.service_load_metrics = service_load_metrics diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_py3.py similarity index 65% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_py3.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_py3.py index d61203eee664..24770fa4122a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_properties_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_properties_py3.py @@ -9,14 +9,14 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties_base_py3 import ServicePropertiesBase +from .service_resource_properties_base_py3 import ServiceResourcePropertiesBase -class ServiceProperties(ServicePropertiesBase): +class ServiceResourceProperties(ServiceResourcePropertiesBase): """The service resource properties. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: StatelessServiceProperties, StatefulServiceProperties + sub-classes are: StatefulServiceProperties, StatelessServiceProperties Variables are only populated by the server, and will be ignored when sending a request. @@ -29,26 +29,33 @@ class ServiceProperties(ServicePropertiesBase): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode :param service_kind: Required. Constant filled by server. :type service_kind: str """ @@ -67,17 +74,19 @@ class ServiceProperties(ServicePropertiesBase): 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'servicePackageActivationMode', 'type': 'str'}, 'service_kind': {'key': 'serviceKind', 'type': 'str'}, } _subtype_map = { - 'service_kind': {'Stateless': 'StatelessServiceProperties', 'Stateful': 'StatefulServiceProperties'} + 'service_kind': {'Stateful': 'StatefulServiceProperties', 'Stateless': 'StatelessServiceProperties'} } - def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, **kwargs) -> None: - super(ServiceProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, **kwargs) + def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, service_package_activation_mode=None, **kwargs) -> None: + super(ServiceResourceProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, **kwargs) self.provisioning_state = None self.service_type_name = service_type_name self.partition_description = partition_description + self.service_package_activation_mode = service_package_activation_mode self.service_kind = None - self.service_kind = 'ServiceProperties' + self.service_kind = 'ServiceResourceProperties' diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_py3.py index f4cd61555ab7..879d09bfb1cf 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_py3.py @@ -18,49 +18,58 @@ class ServiceResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :param placement_constraints: The placement constraints as a string. Placement constraints are boolean expressions on node properties and allow for restricting a service to particular nodes based on the service requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, 'provisioning_state': {'readonly': True}, } @@ -69,6 +78,8 @@ class ServiceResource(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'placement_constraints': {'key': 'properties.placementConstraints', 'type': 'str'}, 'correlation_scheme': {'key': 'properties.correlationScheme', 'type': '[ServiceCorrelationDescription]'}, 'service_load_metrics': {'key': 'properties.serviceLoadMetrics', 'type': '[ServiceLoadMetricDescription]'}, @@ -77,10 +88,11 @@ class ServiceResource(ProxyResource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'properties.serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'properties.partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'properties.servicePackageActivationMode', 'type': 'str'}, } - def __init__(self, *, location: str, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, **kwargs) -> None: - super(ServiceResource, self).__init__(location=location, **kwargs) + def __init__(self, *, location: str=None, tags=None, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, service_package_activation_mode=None, **kwargs) -> None: + super(ServiceResource, self).__init__(location=location, tags=tags, **kwargs) self.placement_constraints = placement_constraints self.correlation_scheme = correlation_scheme self.service_load_metrics = service_load_metrics @@ -89,3 +101,4 @@ def __init__(self, *, location: str, placement_constraints: str=None, correlatio self.provisioning_state = None self.service_type_name = service_type_name self.partition_description = partition_description + self.service_package_activation_mode = service_package_activation_mode diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update.py index be8ef26bbe9b..a5931cb1da99 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update.py @@ -18,41 +18,46 @@ class ServiceResourceUpdate(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :param placement_constraints: The placement constraints as a string. Placement constraints are boolean expressions on node properties and allow for restricting a service to particular nodes based on the service requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, } _attribute_map = { @@ -60,6 +65,8 @@ class ServiceResourceUpdate(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'placement_constraints': {'key': 'properties.placementConstraints', 'type': 'str'}, 'correlation_scheme': {'key': 'properties.correlationScheme', 'type': '[ServiceCorrelationDescription]'}, 'service_load_metrics': {'key': 'properties.serviceLoadMetrics', 'type': '[ServiceLoadMetricDescription]'}, diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_update_properties.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_properties.py similarity index 70% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_update_properties.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_properties.py index 60782c13d5b8..c5aa89edf5b7 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_update_properties.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_properties.py @@ -9,15 +9,15 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties_base import ServicePropertiesBase +from .service_resource_properties_base import ServiceResourcePropertiesBase -class ServiceUpdateProperties(ServicePropertiesBase): +class ServiceResourceUpdateProperties(ServiceResourcePropertiesBase): """The service resource properties for patch operations. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: StatelessServiceUpdateProperties, - StatefulServiceUpdateProperties + sub-classes are: StatefulServiceUpdateProperties, + StatelessServiceUpdateProperties All required parameters must be populated in order to send to Azure. @@ -27,18 +27,21 @@ class ServiceUpdateProperties(ServicePropertiesBase): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :param service_kind: Required. Constant filled by server. :type service_kind: str """ @@ -57,10 +60,10 @@ class ServiceUpdateProperties(ServicePropertiesBase): } _subtype_map = { - 'service_kind': {'Stateless': 'StatelessServiceUpdateProperties', 'Stateful': 'StatefulServiceUpdateProperties'} + 'service_kind': {'Stateful': 'StatefulServiceUpdateProperties', 'Stateless': 'StatelessServiceUpdateProperties'} } def __init__(self, **kwargs): - super(ServiceUpdateProperties, self).__init__(**kwargs) + super(ServiceResourceUpdateProperties, self).__init__(**kwargs) self.service_kind = None - self.service_kind = 'ServiceUpdateProperties' + self.service_kind = 'ServiceResourceUpdateProperties' diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_update_properties_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_properties_py3.py similarity index 67% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_update_properties_py3.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_properties_py3.py index abd33fa92644..5a2b66768621 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_update_properties_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_properties_py3.py @@ -9,15 +9,15 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties_base_py3 import ServicePropertiesBase +from .service_resource_properties_base_py3 import ServiceResourcePropertiesBase -class ServiceUpdateProperties(ServicePropertiesBase): +class ServiceResourceUpdateProperties(ServiceResourcePropertiesBase): """The service resource properties for patch operations. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: StatelessServiceUpdateProperties, - StatefulServiceUpdateProperties + sub-classes are: StatefulServiceUpdateProperties, + StatelessServiceUpdateProperties All required parameters must be populated in order to send to Azure. @@ -27,18 +27,21 @@ class ServiceUpdateProperties(ServicePropertiesBase): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :param service_kind: Required. Constant filled by server. :type service_kind: str """ @@ -57,10 +60,10 @@ class ServiceUpdateProperties(ServicePropertiesBase): } _subtype_map = { - 'service_kind': {'Stateless': 'StatelessServiceUpdateProperties', 'Stateful': 'StatefulServiceUpdateProperties'} + 'service_kind': {'Stateful': 'StatefulServiceUpdateProperties', 'Stateless': 'StatelessServiceUpdateProperties'} } def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, **kwargs) -> None: - super(ServiceUpdateProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, **kwargs) + super(ServiceResourceUpdateProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, **kwargs) self.service_kind = None - self.service_kind = 'ServiceUpdateProperties' + self.service_kind = 'ServiceResourceUpdateProperties' diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_py3.py index c33204e83ebd..02c366ed82f0 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_resource_update_py3.py @@ -18,41 +18,46 @@ class ServiceResourceUpdate(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - - :ivar id: Azure resource ID. + :ivar id: Azure resource identifier. :vartype id: str :ivar name: Azure resource name. :vartype name: str :ivar type: Azure resource type. :vartype type: str - :param location: Required. Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] + :ivar etag: Azure resource etag. + :vartype etag: str :param placement_constraints: The placement constraints as a string. Placement constraints are boolean expressions on node properties and allow for restricting a service to particular nodes based on the service requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, - 'location': {'required': True}, + 'etag': {'readonly': True}, } _attribute_map = { @@ -60,6 +65,8 @@ class ServiceResourceUpdate(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'etag': {'key': 'etag', 'type': 'str'}, 'placement_constraints': {'key': 'properties.placementConstraints', 'type': 'str'}, 'correlation_scheme': {'key': 'properties.correlationScheme', 'type': '[ServiceCorrelationDescription]'}, 'service_load_metrics': {'key': 'properties.serviceLoadMetrics', 'type': '[ServiceLoadMetricDescription]'}, @@ -67,8 +74,8 @@ class ServiceResourceUpdate(ProxyResource): 'default_move_cost': {'key': 'properties.defaultMoveCost', 'type': 'str'}, } - def __init__(self, *, location: str, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, **kwargs) -> None: - super(ServiceResourceUpdate, self).__init__(location=location, **kwargs) + def __init__(self, *, location: str=None, tags=None, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, **kwargs) -> None: + super(ServiceResourceUpdate, self).__init__(location=location, tags=tags, **kwargs) self.placement_constraints = placement_constraints self.correlation_scheme = correlation_scheme self.service_load_metrics = service_load_metrics diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy.py index 79fd16071a1d..2eeb86b3ca95 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy.py @@ -13,11 +13,18 @@ class ServiceTypeDeltaHealthPolicy(Model): - """Service health policy + """Represents the delta health policy used to evaluate the health of services + belonging to a service type when upgrading the cluster. . - :param max_percent_delta_unhealthy_services: Maximum percentage of - unhealthy services in cluster + :param max_percent_delta_unhealthy_services: The maximum allowed + percentage of services health degradation allowed during cluster upgrades. + The delta is measured between the state of the services at the beginning + of upgrade and the state of the services at the time of the health + evaluation. + The check is performed after every upgrade domain upgrade completion to + make sure the global state of the cluster is within tolerated limits. + . Default value: 0 . :type max_percent_delta_unhealthy_services: int """ @@ -31,4 +38,4 @@ class ServiceTypeDeltaHealthPolicy(Model): def __init__(self, **kwargs): super(ServiceTypeDeltaHealthPolicy, self).__init__(**kwargs) - self.max_percent_delta_unhealthy_services = kwargs.get('max_percent_delta_unhealthy_services', None) + self.max_percent_delta_unhealthy_services = kwargs.get('max_percent_delta_unhealthy_services', 0) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy_py3.py index 82263b4e5109..6a67d12680d9 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_delta_health_policy_py3.py @@ -13,11 +13,18 @@ class ServiceTypeDeltaHealthPolicy(Model): - """Service health policy + """Represents the delta health policy used to evaluate the health of services + belonging to a service type when upgrading the cluster. . - :param max_percent_delta_unhealthy_services: Maximum percentage of - unhealthy services in cluster + :param max_percent_delta_unhealthy_services: The maximum allowed + percentage of services health degradation allowed during cluster upgrades. + The delta is measured between the state of the services at the beginning + of upgrade and the state of the services at the time of the health + evaluation. + The check is performed after every upgrade domain upgrade completion to + make sure the global state of the cluster is within tolerated limits. + . Default value: 0 . :type max_percent_delta_unhealthy_services: int """ @@ -29,6 +36,6 @@ class ServiceTypeDeltaHealthPolicy(Model): 'max_percent_delta_unhealthy_services': {'key': 'maxPercentDeltaUnhealthyServices', 'type': 'int'}, } - def __init__(self, *, max_percent_delta_unhealthy_services: int=None, **kwargs) -> None: + def __init__(self, *, max_percent_delta_unhealthy_services: int=0, **kwargs) -> None: super(ServiceTypeDeltaHealthPolicy, self).__init__(**kwargs) self.max_percent_delta_unhealthy_services = max_percent_delta_unhealthy_services diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy.py index a4f29b294bab..eb7d19fdb16a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy.py @@ -17,56 +17,20 @@ class ServiceTypeHealthPolicy(Model): belonging to a service type. . - :param max_percent_unhealthy_partitions_per_service: The maximum allowed - percentage of unhealthy partitions per service. Allowed values are Byte - values from zero to 100 - The percentage represents the maximum tolerated percentage of partitions - that can be unhealthy before the service is considered in error. - If the percentage is respected but there is at least one unhealthy - partition, the health is evaluated as Warning. - The percentage is calculated by dividing the number of unhealthy - partitions over the total number of partitions in the service. - The computation rounds up to tolerate one failure on small numbers of - partitions. Default percentage is zero. - . Default value: 0 . - :type max_percent_unhealthy_partitions_per_service: int - :param max_percent_unhealthy_replicas_per_partition: The maximum allowed - percentage of unhealthy replicas per partition. Allowed values are Byte - values from zero to 100. - The percentage represents the maximum tolerated percentage of replicas - that can be unhealthy before the partition is considered in error. - If the percentage is respected but there is at least one unhealthy - replica, the health is evaluated as Warning. - The percentage is calculated by dividing the number of unhealthy replicas - over the total number of replicas in the partition. - The computation rounds up to tolerate one failure on small numbers of - replicas. Default percentage is zero. - . Default value: 0 . - :type max_percent_unhealthy_replicas_per_partition: int - :param max_percent_unhealthy_services: The maximum maximum allowed - percentage of unhealthy services. Allowed values are Byte values from zero - to 100. - The percentage represents the maximum tolerated percentage of services - that can be unhealthy before the application is considered in error. - If the percentage is respected but there is at least one unhealthy - service, the health is evaluated as Warning. - This is calculated by dividing the number of unhealthy services of the - specific service type over the total number of services of the specific - service type. - The computation rounds up to tolerate one failure on small numbers of - services. Default percentage is zero. + :param max_percent_unhealthy_services: The maximum percentage of services + allowed to be unhealthy before your application is considered in error. . Default value: 0 . :type max_percent_unhealthy_services: int """ + _validation = { + 'max_percent_unhealthy_services': {'maximum': 100, 'minimum': 0}, + } + _attribute_map = { - 'max_percent_unhealthy_partitions_per_service': {'key': 'MaxPercentUnhealthyPartitionsPerService', 'type': 'int'}, - 'max_percent_unhealthy_replicas_per_partition': {'key': 'MaxPercentUnhealthyReplicasPerPartition', 'type': 'int'}, - 'max_percent_unhealthy_services': {'key': 'MaxPercentUnhealthyServices', 'type': 'int'}, + 'max_percent_unhealthy_services': {'key': 'maxPercentUnhealthyServices', 'type': 'int'}, } def __init__(self, **kwargs): super(ServiceTypeHealthPolicy, self).__init__(**kwargs) - self.max_percent_unhealthy_partitions_per_service = kwargs.get('max_percent_unhealthy_partitions_per_service', 0) - self.max_percent_unhealthy_replicas_per_partition = kwargs.get('max_percent_unhealthy_replicas_per_partition', 0) self.max_percent_unhealthy_services = kwargs.get('max_percent_unhealthy_services', 0) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_map_item.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_map_item.py deleted file mode 100644 index baf724649682..000000000000 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_map_item.py +++ /dev/null @@ -1,41 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ServiceTypeHealthPolicyMapItem(Model): - """Defines an item in ServiceTypeHealthPolicyMap. - . - - All required parameters must be populated in order to send to Azure. - - :param key: Required. The key of the service type health policy map item. - This is the name of the service type. - :type key: str - :param value: Required. - :type value: ~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicy - """ - - _validation = { - 'key': {'required': True}, - 'value': {'required': True}, - } - - _attribute_map = { - 'key': {'key': 'Key', 'type': 'str'}, - 'value': {'key': 'Value', 'type': 'ServiceTypeHealthPolicy'}, - } - - def __init__(self, **kwargs): - super(ServiceTypeHealthPolicyMapItem, self).__init__(**kwargs) - self.key = kwargs.get('key', None) - self.value = kwargs.get('value', None) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_map_item_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_map_item_py3.py deleted file mode 100644 index 8d49a6aa7b7d..000000000000 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_map_item_py3.py +++ /dev/null @@ -1,41 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ServiceTypeHealthPolicyMapItem(Model): - """Defines an item in ServiceTypeHealthPolicyMap. - . - - All required parameters must be populated in order to send to Azure. - - :param key: Required. The key of the service type health policy map item. - This is the name of the service type. - :type key: str - :param value: Required. - :type value: ~azure.mgmt.servicefabric.models.ServiceTypeHealthPolicy - """ - - _validation = { - 'key': {'required': True}, - 'value': {'required': True}, - } - - _attribute_map = { - 'key': {'key': 'Key', 'type': 'str'}, - 'value': {'key': 'Value', 'type': 'ServiceTypeHealthPolicy'}, - } - - def __init__(self, *, key: str, value, **kwargs) -> None: - super(ServiceTypeHealthPolicyMapItem, self).__init__(**kwargs) - self.key = key - self.value = value diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_py3.py index e5bd3fa81be9..ad312d69747a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/service_type_health_policy_py3.py @@ -17,56 +17,20 @@ class ServiceTypeHealthPolicy(Model): belonging to a service type. . - :param max_percent_unhealthy_partitions_per_service: The maximum allowed - percentage of unhealthy partitions per service. Allowed values are Byte - values from zero to 100 - The percentage represents the maximum tolerated percentage of partitions - that can be unhealthy before the service is considered in error. - If the percentage is respected but there is at least one unhealthy - partition, the health is evaluated as Warning. - The percentage is calculated by dividing the number of unhealthy - partitions over the total number of partitions in the service. - The computation rounds up to tolerate one failure on small numbers of - partitions. Default percentage is zero. - . Default value: 0 . - :type max_percent_unhealthy_partitions_per_service: int - :param max_percent_unhealthy_replicas_per_partition: The maximum allowed - percentage of unhealthy replicas per partition. Allowed values are Byte - values from zero to 100. - The percentage represents the maximum tolerated percentage of replicas - that can be unhealthy before the partition is considered in error. - If the percentage is respected but there is at least one unhealthy - replica, the health is evaluated as Warning. - The percentage is calculated by dividing the number of unhealthy replicas - over the total number of replicas in the partition. - The computation rounds up to tolerate one failure on small numbers of - replicas. Default percentage is zero. - . Default value: 0 . - :type max_percent_unhealthy_replicas_per_partition: int - :param max_percent_unhealthy_services: The maximum maximum allowed - percentage of unhealthy services. Allowed values are Byte values from zero - to 100. - The percentage represents the maximum tolerated percentage of services - that can be unhealthy before the application is considered in error. - If the percentage is respected but there is at least one unhealthy - service, the health is evaluated as Warning. - This is calculated by dividing the number of unhealthy services of the - specific service type over the total number of services of the specific - service type. - The computation rounds up to tolerate one failure on small numbers of - services. Default percentage is zero. + :param max_percent_unhealthy_services: The maximum percentage of services + allowed to be unhealthy before your application is considered in error. . Default value: 0 . :type max_percent_unhealthy_services: int """ + _validation = { + 'max_percent_unhealthy_services': {'maximum': 100, 'minimum': 0}, + } + _attribute_map = { - 'max_percent_unhealthy_partitions_per_service': {'key': 'MaxPercentUnhealthyPartitionsPerService', 'type': 'int'}, - 'max_percent_unhealthy_replicas_per_partition': {'key': 'MaxPercentUnhealthyReplicasPerPartition', 'type': 'int'}, - 'max_percent_unhealthy_services': {'key': 'MaxPercentUnhealthyServices', 'type': 'int'}, + 'max_percent_unhealthy_services': {'key': 'maxPercentUnhealthyServices', 'type': 'int'}, } - def __init__(self, *, max_percent_unhealthy_partitions_per_service: int=0, max_percent_unhealthy_replicas_per_partition: int=0, max_percent_unhealthy_services: int=0, **kwargs) -> None: + def __init__(self, *, max_percent_unhealthy_services: int=0, **kwargs) -> None: super(ServiceTypeHealthPolicy, self).__init__(**kwargs) - self.max_percent_unhealthy_partitions_per_service = max_percent_unhealthy_partitions_per_service - self.max_percent_unhealthy_replicas_per_partition = max_percent_unhealthy_replicas_per_partition self.max_percent_unhealthy_services = max_percent_unhealthy_services diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description.py index 992031dc8685..ddee0dc7ef89 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description.py @@ -27,7 +27,7 @@ class SingletonPartitionSchemeDescription(PartitionSchemeDescription): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description_py3.py index df9cdb2d6a0c..12bc104c40a0 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/singleton_partition_scheme_description_py3.py @@ -27,7 +27,7 @@ class SingletonPartitionSchemeDescription(PartitionSchemeDescription): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, } def __init__(self, **kwargs) -> None: diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties.py index 120d652d0001..18dad4b32cb2 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties import ServiceProperties +from .service_resource_properties import ServiceResourceProperties -class StatefulServiceProperties(ServiceProperties): +class StatefulServiceProperties(ServiceResourceProperties): """The properties of a stateful service resource. Variables are only populated by the server, and will be ignored when @@ -26,26 +26,33 @@ class StatefulServiceProperties(ServiceProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode :param service_kind: Required. Constant filled by server. :type service_kind: str :param has_persisted_state: A flag indicating whether this is a persistent @@ -86,6 +93,7 @@ class StatefulServiceProperties(ServiceProperties): 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'servicePackageActivationMode', 'type': 'str'}, 'service_kind': {'key': 'serviceKind', 'type': 'str'}, 'has_persisted_state': {'key': 'hasPersistedState', 'type': 'bool'}, 'target_replica_set_size': {'key': 'targetReplicaSetSize', 'type': 'int'}, diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties_py3.py index ca64193d58e7..b519a3af2048 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_properties_py3.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties_py3 import ServiceProperties +from .service_resource_properties_py3 import ServiceResourceProperties -class StatefulServiceProperties(ServiceProperties): +class StatefulServiceProperties(ServiceResourceProperties): """The properties of a stateful service resource. Variables are only populated by the server, and will be ignored when @@ -26,26 +26,33 @@ class StatefulServiceProperties(ServiceProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode :param service_kind: Required. Constant filled by server. :type service_kind: str :param has_persisted_state: A flag indicating whether this is a persistent @@ -86,6 +93,7 @@ class StatefulServiceProperties(ServiceProperties): 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'servicePackageActivationMode', 'type': 'str'}, 'service_kind': {'key': 'serviceKind', 'type': 'str'}, 'has_persisted_state': {'key': 'hasPersistedState', 'type': 'bool'}, 'target_replica_set_size': {'key': 'targetReplicaSetSize', 'type': 'int'}, @@ -95,8 +103,8 @@ class StatefulServiceProperties(ServiceProperties): 'stand_by_replica_keep_duration': {'key': 'standByReplicaKeepDuration', 'type': 'iso-8601'}, } - def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, has_persisted_state: bool=None, target_replica_set_size: int=None, min_replica_set_size: int=None, replica_restart_wait_duration=None, quorum_loss_wait_duration=None, stand_by_replica_keep_duration=None, **kwargs) -> None: - super(StatefulServiceProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, service_type_name=service_type_name, partition_description=partition_description, **kwargs) + def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, service_package_activation_mode=None, has_persisted_state: bool=None, target_replica_set_size: int=None, min_replica_set_size: int=None, replica_restart_wait_duration=None, quorum_loss_wait_duration=None, stand_by_replica_keep_duration=None, **kwargs) -> None: + super(StatefulServiceProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, service_type_name=service_type_name, partition_description=partition_description, service_package_activation_mode=service_package_activation_mode, **kwargs) self.has_persisted_state = has_persisted_state self.target_replica_set_size = target_replica_set_size self.min_replica_set_size = min_replica_set_size diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties.py index 970d7d764245..3d468ae54150 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_update_properties import ServiceUpdateProperties +from .service_resource_update_properties import ServiceResourceUpdateProperties -class StatefulServiceUpdateProperties(ServiceUpdateProperties): +class StatefulServiceUpdateProperties(ServiceResourceUpdateProperties): """The properties of a stateful service resource for patch operations. All required parameters must be populated in order to send to Azure. @@ -23,18 +23,21 @@ class StatefulServiceUpdateProperties(ServiceUpdateProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :param service_kind: Required. Constant filled by server. :type service_kind: str :param target_replica_set_size: The target replica set size as a number. diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties_py3.py index b1300c18b178..c7eb77ec04a9 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateful_service_update_properties_py3.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_update_properties_py3 import ServiceUpdateProperties +from .service_resource_update_properties_py3 import ServiceResourceUpdateProperties -class StatefulServiceUpdateProperties(ServiceUpdateProperties): +class StatefulServiceUpdateProperties(ServiceResourceUpdateProperties): """The properties of a stateful service resource for patch operations. All required parameters must be populated in order to send to Azure. @@ -23,18 +23,21 @@ class StatefulServiceUpdateProperties(ServiceUpdateProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :param service_kind: Required. Constant filled by server. :type service_kind: str :param target_replica_set_size: The target replica set size as a number. diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties.py index 2ede1bf11b02..339973362369 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties import ServiceProperties +from .service_resource_properties import ServiceResourceProperties -class StatelessServiceProperties(ServiceProperties): +class StatelessServiceProperties(ServiceResourceProperties): """The properties of a stateless service resource. Variables are only populated by the server, and will be ignored when @@ -26,26 +26,33 @@ class StatelessServiceProperties(ServiceProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode :param service_kind: Required. Constant filled by server. :type service_kind: str :param instance_count: The instance count. @@ -67,6 +74,7 @@ class StatelessServiceProperties(ServiceProperties): 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'servicePackageActivationMode', 'type': 'str'}, 'service_kind': {'key': 'serviceKind', 'type': 'str'}, 'instance_count': {'key': 'instanceCount', 'type': 'int'}, } diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties_py3.py index d507266534fa..fb309b9311af 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_properties_py3.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_properties_py3 import ServiceProperties +from .service_resource_properties_py3 import ServiceResourceProperties -class StatelessServiceProperties(ServiceProperties): +class StatelessServiceProperties(ServiceResourceProperties): """The properties of a stateless service resource. Variables are only populated by the server, and will be ignored when @@ -26,26 +26,33 @@ class StatelessServiceProperties(ServiceProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response :vartype provisioning_state: str :param service_type_name: The name of the service type :type service_type_name: str - :param partition_description: + :param partition_description: Describes how the service is partitioned. :type partition_description: ~azure.mgmt.servicefabric.models.PartitionSchemeDescription + :param service_package_activation_mode: The activation Mode of the service + package. Possible values include: 'SharedProcess', 'ExclusiveProcess' + :type service_package_activation_mode: str or + ~azure.mgmt.servicefabric.models.ArmServicePackageActivationMode :param service_kind: Required. Constant filled by server. :type service_kind: str :param instance_count: The instance count. @@ -67,11 +74,12 @@ class StatelessServiceProperties(ServiceProperties): 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'service_type_name': {'key': 'serviceTypeName', 'type': 'str'}, 'partition_description': {'key': 'partitionDescription', 'type': 'PartitionSchemeDescription'}, + 'service_package_activation_mode': {'key': 'servicePackageActivationMode', 'type': 'str'}, 'service_kind': {'key': 'serviceKind', 'type': 'str'}, 'instance_count': {'key': 'instanceCount', 'type': 'int'}, } - def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, instance_count: int=None, **kwargs) -> None: - super(StatelessServiceProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, service_type_name=service_type_name, partition_description=partition_description, **kwargs) + def __init__(self, *, placement_constraints: str=None, correlation_scheme=None, service_load_metrics=None, service_placement_policies=None, default_move_cost=None, service_type_name: str=None, partition_description=None, service_package_activation_mode=None, instance_count: int=None, **kwargs) -> None: + super(StatelessServiceProperties, self).__init__(placement_constraints=placement_constraints, correlation_scheme=correlation_scheme, service_load_metrics=service_load_metrics, service_placement_policies=service_placement_policies, default_move_cost=default_move_cost, service_type_name=service_type_name, partition_description=partition_description, service_package_activation_mode=service_package_activation_mode, **kwargs) self.instance_count = instance_count self.service_kind = 'Stateless' diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties.py index 2e7a55bd1e63..99822c277710 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_update_properties import ServiceUpdateProperties +from .service_resource_update_properties import ServiceResourceUpdateProperties -class StatelessServiceUpdateProperties(ServiceUpdateProperties): +class StatelessServiceUpdateProperties(ServiceResourceUpdateProperties): """The properties of a stateless service resource for patch operations. All required parameters must be populated in order to send to Azure. @@ -23,18 +23,21 @@ class StatelessServiceUpdateProperties(ServiceUpdateProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :param service_kind: Required. Constant filled by server. :type service_kind: str :param instance_count: The instance count. diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties_py3.py index fb7edd8baf3f..a3f9a03058c3 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/stateless_service_update_properties_py3.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .service_update_properties_py3 import ServiceUpdateProperties +from .service_resource_update_properties_py3 import ServiceResourceUpdateProperties -class StatelessServiceUpdateProperties(ServiceUpdateProperties): +class StatelessServiceUpdateProperties(ServiceResourceUpdateProperties): """The properties of a stateless service resource for patch operations. All required parameters must be populated in order to send to Azure. @@ -23,18 +23,21 @@ class StatelessServiceUpdateProperties(ServiceUpdateProperties): requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". :type placement_constraints: str - :param correlation_scheme: + :param correlation_scheme: A list that describes the correlation of the + service with other services. :type correlation_scheme: list[~azure.mgmt.servicefabric.models.ServiceCorrelationDescription] - :param service_load_metrics: + :param service_load_metrics: The service load metrics is given as an array + of ServiceLoadMetricDescription objects. :type service_load_metrics: list[~azure.mgmt.servicefabric.models.ServiceLoadMetricDescription] - :param service_placement_policies: + :param service_placement_policies: A list that describes the correlation + of the service with other services. :type service_placement_policies: list[~azure.mgmt.servicefabric.models.ServicePlacementPolicyDescription] - :param default_move_cost: Possible values include: 'Zero', 'Low', - 'Medium', 'High' - :type default_move_cost: str or ~azure.mgmt.servicefabric.models.enum + :param default_move_cost: Specifies the move cost for the service. + Possible values include: 'Zero', 'Low', 'Medium', 'High' + :type default_move_cost: str or ~azure.mgmt.servicefabric.models.MoveCost :param service_kind: Required. Constant filled by server. :type service_kind: str :param instance_count: The instance count. diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description.py index bd7e8f064df5..27fbf9ba5f8c 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description.py @@ -40,7 +40,7 @@ class UniformInt64RangePartitionSchemeDescription(PartitionSchemeDescription): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, 'count': {'key': 'Count', 'type': 'int'}, 'low_key': {'key': 'LowKey', 'type': 'str'}, 'high_key': {'key': 'HighKey', 'type': 'str'}, diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description_py3.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description_py3.py index 35e0d24d9ac8..811eefb8b6ca 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description_py3.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/uniform_int64_range_partition_scheme_description_py3.py @@ -40,7 +40,7 @@ class UniformInt64RangePartitionSchemeDescription(PartitionSchemeDescription): } _attribute_map = { - 'partition_scheme': {'key': 'PartitionScheme', 'type': 'str'}, + 'partition_scheme': {'key': 'partitionScheme', 'type': 'str'}, 'count': {'key': 'Count', 'type': 'int'}, 'low_key': {'key': 'LowKey', 'type': 'str'}, 'high_key': {'key': 'HighKey', 'type': 'str'}, diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/__init__.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/__init__.py index f8979532531d..2fc13f2c6913 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/__init__.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/__init__.py @@ -12,17 +12,17 @@ from .clusters_operations import ClustersOperations from .cluster_versions_operations import ClusterVersionsOperations from .operations import Operations -from .application_type_operations import ApplicationTypeOperations -from .version_operations import VersionOperations -from .application_operations import ApplicationOperations -from .service_operations import ServiceOperations +from .application_types_operations import ApplicationTypesOperations +from .application_type_versions_operations import ApplicationTypeVersionsOperations +from .applications_operations import ApplicationsOperations +from .services_operations import ServicesOperations __all__ = [ 'ClustersOperations', 'ClusterVersionsOperations', 'Operations', - 'ApplicationTypeOperations', - 'VersionOperations', - 'ApplicationOperations', - 'ServiceOperations', + 'ApplicationTypesOperations', + 'ApplicationTypeVersionsOperations', + 'ApplicationsOperations', + 'ServicesOperations', ] diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/version_operations.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_type_versions_operations.py similarity index 81% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/version_operations.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_type_versions_operations.py index 40213e72e6f4..4bb4f0d2367c 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/version_operations.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_type_versions_operations.py @@ -17,14 +17,14 @@ from .. import models -class VersionOperations(object): - """VersionOperations operations. +class ApplicationTypeVersionsOperations(object): + """ApplicationTypeVersionsOperations operations. :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The version of the API. Constant value: "2017-07-01-preview". + :ivar api_version: The version of the Service Fabric resource provider API. This is a required parameter and it's value must be "2019-03-01-preview" for this specification. Constant value: "2019-03-01-preview". """ models = models @@ -34,20 +34,24 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-07-01-preview" + self.api_version = "2019-03-01-preview" self.config = config def get( self, resource_group_name, cluster_name, application_type_name, version, custom_headers=None, raw=False, **operation_config): - """Returns an application type version resource. + """Gets a Service Fabric application type version resource. + + Get a Service Fabric application type version resource created or in + the process of being created in the Service Fabric application type + name resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_type_name: The name of the application type name - resource + resource. :type application_type_name: str :param version: The application type version. :type version: str @@ -56,8 +60,10 @@ def get( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: VersionResource or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.servicefabric.models.VersionResource or + :return: ApplicationTypeVersionResource or ClientRawResponse if + raw=true + :rtype: + ~azure.mgmt.servicefabric.models.ApplicationTypeVersionResource or ~msrest.pipeline.ClientRawResponse :raises: :class:`ErrorModelException` @@ -97,7 +103,7 @@ def get( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('VersionResource', response) + deserialized = self._deserialize('ApplicationTypeVersionResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -107,12 +113,10 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applicationTypes/{applicationTypeName}/versions/{version}'} - def _put_initial( - self, resource_group_name, cluster_name, application_type_name, version, location, app_package_url, custom_headers=None, raw=False, **operation_config): - parameters = models.VersionResource(location=location, app_package_url=app_package_url) - + def _create_initial( + self, resource_group_name, cluster_name, application_type_name, version, parameters, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.put.metadata['url'] + url = self.create.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -138,7 +142,7 @@ def _put_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(parameters, 'VersionResource') + body_content = self._serialize.body(parameters, 'ApplicationTypeVersionResource') # Construct and send request request = self._client.put(url, query_parameters, header_parameters, body_content) @@ -150,7 +154,7 @@ def _put_initial( deserialized = None if response.status_code == 202: - deserialized = self._deserialize('VersionResource', response) + deserialized = self._deserialize('ApplicationTypeVersionResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -158,51 +162,53 @@ def _put_initial( return deserialized - def put( - self, resource_group_name, cluster_name, application_type_name, version, location, app_package_url, custom_headers=None, raw=False, polling=True, **operation_config): - """Provisions an application type version resource. + def create( + self, resource_group_name, cluster_name, application_type_name, version, parameters, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates or updates a Service Fabric application type version resource. + + Create or update a Service Fabric application type version resource + with the specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_type_name: The name of the application type name - resource + resource. :type application_type_name: str :param version: The application type version. :type version: str - :param location: Resource location. - :type location: str - :param app_package_url: The URL to the application package - :type app_package_url: str + :param parameters: The application type version resource. + :type parameters: + ~azure.mgmt.servicefabric.models.ApplicationTypeVersionResource :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 :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns VersionResource or - ClientRawResponse if raw==True + :return: An instance of LROPoller that returns + ApplicationTypeVersionResource or + ClientRawResponse if raw==True :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.servicefabric.models.VersionResource] + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.servicefabric.models.ApplicationTypeVersionResource] or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.servicefabric.models.VersionResource]] + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.servicefabric.models.ApplicationTypeVersionResource]] :raises: :class:`ErrorModelException` """ - raw_result = self._put_initial( + raw_result = self._create_initial( resource_group_name=resource_group_name, cluster_name=cluster_name, application_type_name=application_type_name, version=version, - location=location, - app_package_url=app_package_url, + parameters=parameters, custom_headers=custom_headers, raw=True, **operation_config ) def get_long_running_output(response): - deserialized = self._deserialize('VersionResource', response) + deserialized = self._deserialize('ApplicationTypeVersionResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -217,7 +223,7 @@ def get_long_running_output(response): elif polling is False: polling_method = NoPolling() else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - put.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applicationTypes/{applicationTypeName}/versions/{version}'} + create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applicationTypes/{applicationTypeName}/versions/{version}'} def _delete_initial( @@ -259,14 +265,17 @@ def _delete_initial( def delete( self, resource_group_name, cluster_name, application_type_name, version, custom_headers=None, raw=False, polling=True, **operation_config): - """Unprovisions an application type version resource. + """Deletes a Service Fabric application type version resource. + + Delete a Service Fabric application type version resource with the + specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_type_name: The name of the application type name - resource + resource. :type application_type_name: str :param version: The application type version. :type version: str @@ -308,22 +317,28 @@ def get_long_running_output(response): def list( self, resource_group_name, cluster_name, application_type_name, custom_headers=None, raw=False, **operation_config): - """Returns all versions for the specified application type. + """Gets the list of application type version resources created in the + specified Service Fabric application type name resource. + + Gets all application type version resources created or in the process + of being created in the Service Fabric application type name resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_type_name: The name of the application type name - resource + resource. :type application_type_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: VersionResourceList or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.servicefabric.models.VersionResourceList or + :return: ApplicationTypeVersionResourceList or ClientRawResponse if + raw=true + :rtype: + ~azure.mgmt.servicefabric.models.ApplicationTypeVersionResourceList or ~msrest.pipeline.ClientRawResponse :raises: :class:`ErrorModelException` @@ -362,7 +377,7 @@ def list( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('VersionResourceList', response) + deserialized = self._deserialize('ApplicationTypeVersionResourceList', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_type_operations.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_types_operations.py similarity index 87% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_type_operations.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_types_operations.py index 2299f2b9a9b4..38a9aa537a56 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_type_operations.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_types_operations.py @@ -17,14 +17,14 @@ from .. import models -class ApplicationTypeOperations(object): - """ApplicationTypeOperations operations. +class ApplicationTypesOperations(object): + """ApplicationTypesOperations operations. :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The version of the API. Constant value: "2017-07-01-preview". + :ivar api_version: The version of the Service Fabric resource provider API. This is a required parameter and it's value must be "2019-03-01-preview" for this specification. Constant value: "2019-03-01-preview". """ models = models @@ -34,20 +34,23 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-07-01-preview" + self.api_version = "2019-03-01-preview" self.config = config def get( self, resource_group_name, cluster_name, application_type_name, custom_headers=None, raw=False, **operation_config): - """Returns an application type name resource. + """Gets a Service Fabric application type name resource. + + Get a Service Fabric application type name resource created or in the + process of being created in the Service Fabric cluster resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_type_name: The name of the application type name - resource + resource. :type application_type_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -103,19 +106,24 @@ def get( return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applicationTypes/{applicationTypeName}'} - def put( - self, resource_group_name, cluster_name, application_type_name, location, custom_headers=None, raw=False, **operation_config): - """Creates the application type name resource. + def create( + self, resource_group_name, cluster_name, application_type_name, location=None, tags=None, custom_headers=None, raw=False, **operation_config): + """Creates or updates a Service Fabric application type name resource. + + Create or update a Service Fabric application type name resource with + the specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_type_name: The name of the application type name - resource + resource. :type application_type_name: str - :param location: Resource location. + :param location: Azure resource location. :type location: str + :param tags: Azure resource tags. + :type tags: dict[str, str] :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -127,10 +135,10 @@ def put( :raises: :class:`ErrorModelException` """ - parameters = models.ApplicationTypeResource(location=location) + parameters = models.ApplicationTypeResource(location=location, tags=tags) # Construct URL - url = self.put.metadata['url'] + url = self.create.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -174,7 +182,7 @@ def put( return client_raw_response return deserialized - put.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applicationTypes/{applicationTypeName}'} + create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applicationTypes/{applicationTypeName}'} def _delete_initial( @@ -215,14 +223,17 @@ def _delete_initial( def delete( self, resource_group_name, cluster_name, application_type_name, custom_headers=None, raw=False, polling=True, **operation_config): - """Deletes the application type name resource. + """Deletes a Service Fabric application type name resource. + + Delete a Service Fabric application type name resource with the + specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_type_name: The name of the application type name - resource + resource. :type application_type_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -261,11 +272,15 @@ def get_long_running_output(response): def list( self, resource_group_name, cluster_name, custom_headers=None, raw=False, **operation_config): - """Returns all application type names in the specified cluster. + """Gets the list of application type name resources created in the + specified Service Fabric cluster resource. + + Gets all application type name resources created or in the process of + being created in the Service Fabric cluster resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_operations.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/applications_operations.py similarity index 89% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_operations.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/applications_operations.py index eae8b5451a2c..67d3a75aae04 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/application_operations.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/applications_operations.py @@ -17,14 +17,14 @@ from .. import models -class ApplicationOperations(object): - """ApplicationOperations operations. +class ApplicationsOperations(object): + """ApplicationsOperations operations. :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The version of the API. Constant value: "2017-07-01-preview". + :ivar api_version: The version of the Service Fabric resource provider API. This is a required parameter and it's value must be "2019-03-01-preview" for this specification. Constant value: "2019-03-01-preview". """ models = models @@ -34,17 +34,20 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-07-01-preview" + self.api_version = "2019-03-01-preview" self.config = config def get( self, resource_group_name, cluster_name, application_name, custom_headers=None, raw=False, **operation_config): - """Returns an application resource with the specified name. + """Gets a Service Fabric application resource. + + Get a Service Fabric application resource created or in the process of + being created in the Service Fabric cluster resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -103,10 +106,10 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}'} - def _put_initial( + def _create_initial( self, resource_group_name, cluster_name, application_name, parameters, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.put.metadata['url'] + url = self.create.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -151,13 +154,16 @@ def _put_initial( return deserialized - def put( + def create( self, resource_group_name, cluster_name, application_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): - """Creates or updates an application resource with the specified name. + """Creates or updates a Service Fabric application resource. + + Create or update a Service Fabric application resource with the + specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -177,7 +183,7 @@ def put( :raises: :class:`ErrorModelException` """ - raw_result = self._put_initial( + raw_result = self._create_initial( resource_group_name=resource_group_name, cluster_name=cluster_name, application_name=application_name, @@ -203,13 +209,13 @@ def get_long_running_output(response): elif polling is False: polling_method = NoPolling() else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - put.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}'} + create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}'} - def _patch_initial( + def _update_initial( self, resource_group_name, cluster_name, application_name, parameters, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.patch.metadata['url'] + url = self.update.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -246,7 +252,7 @@ def _patch_initial( deserialized = None if response.status_code == 202: - deserialized = self._deserialize('ApplicationResourceUpdate', response) + deserialized = self._deserialize('ApplicationResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -254,13 +260,15 @@ def _patch_initial( return deserialized - def patch( + def update( self, resource_group_name, cluster_name, application_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): - """Updates an application resource with the specified name. + """Updates a Service Fabric application resource. + + Update a Service Fabric application resource with the specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -272,17 +280,16 @@ def patch( direct response alongside the deserialized response :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns - ApplicationResourceUpdate or - ClientRawResponse if raw==True + :return: An instance of LROPoller that returns ApplicationResource or + ClientRawResponse if raw==True :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.servicefabric.models.ApplicationResourceUpdate] + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.servicefabric.models.ApplicationResource] or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.servicefabric.models.ApplicationResourceUpdate]] + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.servicefabric.models.ApplicationResource]] :raises: :class:`ErrorModelException` """ - raw_result = self._patch_initial( + raw_result = self._update_initial( resource_group_name=resource_group_name, cluster_name=cluster_name, application_name=application_name, @@ -293,7 +300,7 @@ def patch( ) def get_long_running_output(response): - deserialized = self._deserialize('ApplicationResourceUpdate', response) + deserialized = self._deserialize('ApplicationResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -308,7 +315,7 @@ def get_long_running_output(response): elif polling is False: polling_method = NoPolling() else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - patch.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}'} + update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}'} def _delete_initial( @@ -349,11 +356,13 @@ def _delete_initial( def delete( self, resource_group_name, cluster_name, application_name, custom_headers=None, raw=False, polling=True, **operation_config): - """Deletes an application resource with the specified name. + """Deletes a Service Fabric application resource. + + Delete a Service Fabric application resource with the specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -394,11 +403,15 @@ def get_long_running_output(response): def list( self, resource_group_name, cluster_name, custom_headers=None, raw=False, **operation_config): - """Returns all application resources in the specified cluster. + """Gets the list of application resources created in the specified Service + Fabric cluster resource. + + Gets all application resources created or in the process of being + created in the Service Fabric cluster resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/cluster_versions_operations.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/cluster_versions_operations.py index ec32a96390ad..196308667d9a 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/cluster_versions_operations.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/cluster_versions_operations.py @@ -23,7 +23,7 @@ class ClusterVersionsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The version of the API. Constant value: "2017-07-01-preview". + :ivar api_version: The version of the Service Fabric resource provider API. This is a required parameter and it's value must be "2019-03-01-preview" for this specification. Constant value: "2019-03-01-preview". """ models = models @@ -33,21 +33,22 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-07-01-preview" + self.api_version = "2019-03-01-preview" self.config = config def get( self, location, cluster_version, custom_headers=None, raw=False, **operation_config): - """Get cluster code versions. + """Gets information about a Service Fabric cluster code version available + in the specified location. - Get cluster code versions by location - . + Gets information about an available Service Fabric cluster code + version. - :param location: The location for the cluster code versions, this is - different from cluster location + :param location: The location for the cluster code versions. This is + different from cluster location. :type location: str - :param cluster_version: The cluster code version + :param cluster_version: The cluster code version. :type cluster_version: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -106,18 +107,19 @@ def get( def get_by_environment( self, location, environment, cluster_version, custom_headers=None, raw=False, **operation_config): - """Get cluster code versions by environment. + """Gets information about a Service Fabric cluster code version available + for the specified environment. - Get cluster code versions by environment - . + Gets information about an available Service Fabric cluster code version + by environment. - :param location: The location for the cluster code versions, this is - different from cluster location + :param location: The location for the cluster code versions. This is + different from cluster location. :type location: str - :param environment: Cluster operating system, the default means all. - Possible values include: 'Windows', 'Linux' + :param environment: The operating system of the cluster. The default + means all. Possible values include: 'Windows', 'Linux' :type environment: str - :param cluster_version: The cluster code version + :param cluster_version: The cluster code version. :type cluster_version: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -177,13 +179,14 @@ def get_by_environment( def list( self, location, custom_headers=None, raw=False, **operation_config): - """List cluster code versions by location. + """Gets the list of Service Fabric cluster code versions available for the + specified location. - List cluster code versions by location - . + Gets all available code versions for Service Fabric cluster resources + by location. - :param location: The location for the cluster code versions, this is - different from cluster location + :param location: The location for the cluster code versions. This is + different from cluster location. :type location: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -241,16 +244,17 @@ def list( def list_by_environment( self, location, environment, custom_headers=None, raw=False, **operation_config): - """List cluster code versions by environment. + """Gets the list of Service Fabric cluster code versions available for the + specified environment. - List cluster code versions by environment - . + Gets all available code versions for Service Fabric cluster resources + by environment. - :param location: The location for the cluster code versions, this is - different from cluster location + :param location: The location for the cluster code versions. This is + different from cluster location. :type location: str - :param environment: Cluster operating system, the default means all. - Possible values include: 'Windows', 'Linux' + :param environment: The operating system of the cluster. The default + means all. Possible values include: 'Windows', 'Linux' :type environment: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/clusters_operations.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/clusters_operations.py index dd256d4c2241..7b7e1524196c 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/clusters_operations.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/clusters_operations.py @@ -24,7 +24,7 @@ class ClustersOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The version of the API. Constant value: "2017-07-01-preview". + :ivar api_version: The version of the Service Fabric resource provider API. This is a required parameter and it's value must be "2019-03-01-preview" for this specification. Constant value: "2019-03-01-preview". """ models = models @@ -34,10 +34,74 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-07-01-preview" + self.api_version = "2019-03-01-preview" self.config = config + def get( + self, resource_group_name, cluster_name, custom_headers=None, raw=False, **operation_config): + """Gets a Service Fabric cluster resource. + + Get a Service Fabric cluster resource created or in the process of + being created in the specified resource group. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param cluster_name: The name of the cluster resource. + :type cluster_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: Cluster or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.servicefabric.models.Cluster or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorModelException` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorModelException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('Cluster', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}'} + def _create_initial( self, resource_group_name, cluster_name, parameters, custom_headers=None, raw=False, **operation_config): @@ -79,6 +143,8 @@ def _create_initial( if response.status_code == 200: deserialized = self._deserialize('Cluster', response) + if response.status_code == 202: + deserialized = self._deserialize('Cluster', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -88,14 +154,14 @@ def _create_initial( def create( self, resource_group_name, cluster_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): - """Create a ServiceFabric cluster. + """Creates or updates a Service Fabric cluster resource. - Create cluster resource - . + Create or update a Service Fabric cluster resource with the specified + name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param parameters: The cluster resource. :type parameters: ~azure.mgmt.servicefabric.models.Cluster @@ -140,125 +206,6 @@ def get_long_running_output(response): return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}'} - def delete( - self, resource_group_name, cluster_name, custom_headers=None, raw=False, **operation_config): - """Delete cluster resource. - - Delete cluster resource - . - - :param resource_group_name: The name of the resource group. - :type resource_group_name: str - :param cluster_name: The name of the cluster resource - :type cluster_name: str - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorModelException` - """ - # Construct URL - url = self.delete.metadata['url'] - path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), - 'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'), - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - # Construct headers - header_parameters = {} - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.delete(url, query_parameters, header_parameters) - response = self._client.send(request, stream=False, **operation_config) - - if response.status_code not in [200, 204]: - raise models.ErrorModelException(self._deserialize, response) - - if raw: - client_raw_response = ClientRawResponse(None, response) - return client_raw_response - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}'} - - def get( - self, resource_group_name, cluster_name, custom_headers=None, raw=False, **operation_config): - """Get cluster resource. - - Get cluster resource - . - - :param resource_group_name: The name of the resource group. - :type resource_group_name: str - :param cluster_name: The name of the cluster resource - :type cluster_name: str - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: Cluster or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.servicefabric.models.Cluster or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorModelException` - """ - # Construct URL - url = self.get.metadata['url'] - path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), - 'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'), - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - # Construct headers - header_parameters = {} - header_parameters['Accept'] = 'application/json' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.get(url, query_parameters, header_parameters) - response = self._client.send(request, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorModelException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('Cluster', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}'} - def _update_initial( self, resource_group_name, cluster_name, parameters, custom_headers=None, raw=False, **operation_config): @@ -300,6 +247,8 @@ def _update_initial( if response.status_code == 200: deserialized = self._deserialize('Cluster', response) + if response.status_code == 202: + deserialized = self._deserialize('Cluster', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -309,14 +258,14 @@ def _update_initial( def update( self, resource_group_name, cluster_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): - """Update cluster configuration. + """Updates the configuration of a Service Fabric cluster resource. - Update cluster configuration - . + Update the configuration of a Service Fabric cluster resource with the + specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param parameters: The parameters which contains the property value and property name which used to update the cluster configuration. @@ -363,12 +312,67 @@ def get_long_running_output(response): return LROPoller(self._client, raw_result, get_long_running_output, polling_method) update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}'} + def delete( + self, resource_group_name, cluster_name, custom_headers=None, raw=False, **operation_config): + """Deletes a Service Fabric cluster resource. + + Delete a Service Fabric cluster resource with the specified name. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param cluster_name: The name of the cluster resource. + :type cluster_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorModelException` + """ + # Construct URL + url = self.delete.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 204]: + raise models.ErrorModelException(self._deserialize, response) + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}'} + def list_by_resource_group( self, resource_group_name, custom_headers=None, raw=False, **operation_config): - """List cluster resource by resource group. + """Gets the list of Service Fabric cluster resources created in the + specified resource group. - List cluster resource by resource group - . + Gets all Service Fabric cluster resources created or in the process of + being created in the resource group. :param resource_group_name: The name of the resource group. :type resource_group_name: str @@ -426,10 +430,11 @@ def list_by_resource_group( def list( self, custom_headers=None, raw=False, **operation_config): - """List cluster resource. + """Gets the list of Service Fabric cluster resources created in the + specified subscription. - List cluster resource - . + Gets all Service Fabric cluster resources created or in the process of + being created in the subscription. :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/operations.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/operations.py index d14df933220d..13970c7e1372 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/operations.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/operations.py @@ -36,11 +36,14 @@ def __init__(self, client, config, serializer, deserializer): def list( self, api_version, custom_headers=None, raw=False, **operation_config): - """Lists all of the available ServiceFabric Resource Manager REST API + """Lists all of the available Service Fabric resource provider API operations. - :param api_version: The version of the ServiceFabric resouce provider - api + Get the list of available Service Fabric resource provider API + operations. + + :param api_version: The version of the Service Fabric resource + provider API :type api_version: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/service_operations.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/services_operations.py similarity index 89% rename from azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/service_operations.py rename to azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/services_operations.py index c016f18143f7..8f7467d504a5 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/service_operations.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/operations/services_operations.py @@ -17,14 +17,14 @@ from .. import models -class ServiceOperations(object): - """ServiceOperations operations. +class ServicesOperations(object): + """ServicesOperations operations. :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The version of the API. Constant value: "2017-07-01-preview". + :ivar api_version: The version of the Service Fabric resource provider API. This is a required parameter and it's value must be "2019-03-01-preview" for this specification. Constant value: "2019-03-01-preview". """ models = models @@ -34,17 +34,20 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-07-01-preview" + self.api_version = "2019-03-01-preview" self.config = config def get( self, resource_group_name, cluster_name, application_name, service_name, custom_headers=None, raw=False, **operation_config): - """Returns a service resource with the specified name. + """Gets a Service Fabric service resource. + + Get a Service Fabric service resource created or in the process of + being created in the Service Fabric application resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -107,10 +110,10 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}/services/{serviceName}'} - def _put_initial( + def _create_initial( self, resource_group_name, cluster_name, application_name, service_name, parameters, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.put.metadata['url'] + url = self.create.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -156,13 +159,16 @@ def _put_initial( return deserialized - def put( + def create( self, resource_group_name, cluster_name, application_name, service_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): - """Creates or updates a service resource with the specified name. + """Creates or updates a Service Fabric service resource. + + Create or update a Service Fabric service resource with the specified + name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -185,7 +191,7 @@ def put( :raises: :class:`ErrorModelException` """ - raw_result = self._put_initial( + raw_result = self._create_initial( resource_group_name=resource_group_name, cluster_name=cluster_name, application_name=application_name, @@ -212,13 +218,13 @@ def get_long_running_output(response): elif polling is False: polling_method = NoPolling() else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - put.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}/services/{serviceName}'} + create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}/services/{serviceName}'} - def _patch_initial( + def _update_initial( self, resource_group_name, cluster_name, application_name, service_name, parameters, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.patch.metadata['url'] + url = self.update.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -256,7 +262,7 @@ def _patch_initial( deserialized = None if response.status_code == 202: - deserialized = self._deserialize('ServiceResourceUpdate', response) + deserialized = self._deserialize('ServiceResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -264,13 +270,15 @@ def _patch_initial( return deserialized - def patch( + def update( self, resource_group_name, cluster_name, application_name, service_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): - """Updates a service resource with the specified name. + """Updates a Service Fabric service resource. + + Update a Service Fabric service resource with the specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -285,16 +293,16 @@ def patch( direct response alongside the deserialized response :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns ServiceResourceUpdate - or ClientRawResponse if raw==True + :return: An instance of LROPoller that returns ServiceResource or + ClientRawResponse if raw==True :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.servicefabric.models.ServiceResourceUpdate] + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.servicefabric.models.ServiceResource] or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.servicefabric.models.ServiceResourceUpdate]] + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.servicefabric.models.ServiceResource]] :raises: :class:`ErrorModelException` """ - raw_result = self._patch_initial( + raw_result = self._update_initial( resource_group_name=resource_group_name, cluster_name=cluster_name, application_name=application_name, @@ -306,7 +314,7 @@ def patch( ) def get_long_running_output(response): - deserialized = self._deserialize('ServiceResourceUpdate', response) + deserialized = self._deserialize('ServiceResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -321,7 +329,7 @@ def get_long_running_output(response): elif polling is False: polling_method = NoPolling() else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - patch.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}/services/{serviceName}'} + update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/clusters/{clusterName}/applications/{applicationName}/services/{serviceName}'} def _delete_initial( @@ -363,11 +371,13 @@ def _delete_initial( def delete( self, resource_group_name, cluster_name, application_name, service_name, custom_headers=None, raw=False, polling=True, **operation_config): - """Deletes a service resource with the specified name. + """Deletes a Service Fabric service resource. + + Delete a Service Fabric service resource with the specified name. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str @@ -412,11 +422,15 @@ def get_long_running_output(response): def list( self, resource_group_name, cluster_name, application_name, custom_headers=None, raw=False, **operation_config): - """Returns all service resources in the specified application. + """Gets the list of service resources created in the specified Service + Fabric application resource. + + Gets all service resources created or in the process of being created + in the Service Fabric application resource. :param resource_group_name: The name of the resource group. :type resource_group_name: str - :param cluster_name: The name of the cluster resource + :param cluster_name: The name of the cluster resource. :type cluster_name: str :param application_name: The name of the application resource. :type application_name: str diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/service_fabric_management_client.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/service_fabric_management_client.py index ba9ca0a0e3f7..c8d6f9532cc8 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/service_fabric_management_client.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/service_fabric_management_client.py @@ -16,10 +16,10 @@ from .operations.clusters_operations import ClustersOperations from .operations.cluster_versions_operations import ClusterVersionsOperations from .operations.operations import Operations -from .operations.application_type_operations import ApplicationTypeOperations -from .operations.version_operations import VersionOperations -from .operations.application_operations import ApplicationOperations -from .operations.service_operations import ServiceOperations +from .operations.application_types_operations import ApplicationTypesOperations +from .operations.application_type_versions_operations import ApplicationTypeVersionsOperations +from .operations.applications_operations import ApplicationsOperations +from .operations.services_operations import ServicesOperations from . import models @@ -31,7 +31,7 @@ class ServiceFabricManagementClientConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param subscription_id: The customer subscription identifier + :param subscription_id: The customer subscription identifier. :type subscription_id: str :param str base_url: Service URL """ @@ -67,19 +67,19 @@ class ServiceFabricManagementClient(SDKClient): :vartype cluster_versions: azure.mgmt.servicefabric.operations.ClusterVersionsOperations :ivar operations: Operations operations :vartype operations: azure.mgmt.servicefabric.operations.Operations - :ivar application_type: ApplicationType operations - :vartype application_type: azure.mgmt.servicefabric.operations.ApplicationTypeOperations - :ivar version: Version operations - :vartype version: azure.mgmt.servicefabric.operations.VersionOperations - :ivar application: Application operations - :vartype application: azure.mgmt.servicefabric.operations.ApplicationOperations - :ivar service: Service operations - :vartype service: azure.mgmt.servicefabric.operations.ServiceOperations + :ivar application_types: ApplicationTypes operations + :vartype application_types: azure.mgmt.servicefabric.operations.ApplicationTypesOperations + :ivar application_type_versions: ApplicationTypeVersions operations + :vartype application_type_versions: azure.mgmt.servicefabric.operations.ApplicationTypeVersionsOperations + :ivar applications: Applications operations + :vartype applications: azure.mgmt.servicefabric.operations.ApplicationsOperations + :ivar services: Services operations + :vartype services: azure.mgmt.servicefabric.operations.ServicesOperations :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param subscription_id: The customer subscription identifier + :param subscription_id: The customer subscription identifier. :type subscription_id: str :param str base_url: Service URL """ @@ -91,7 +91,7 @@ def __init__( super(ServiceFabricManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2017-07-01-preview' + self.api_version = '2019-03-01-preview' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) @@ -101,11 +101,11 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.operations = Operations( self._client, self.config, self._serialize, self._deserialize) - self.application_type = ApplicationTypeOperations( + self.application_types = ApplicationTypesOperations( self._client, self.config, self._serialize, self._deserialize) - self.version = VersionOperations( + self.application_type_versions = ApplicationTypeVersionsOperations( self._client, self.config, self._serialize, self._deserialize) - self.application = ApplicationOperations( + self.applications = ApplicationsOperations( self._client, self.config, self._serialize, self._deserialize) - self.service = ServiceOperations( + self.services = ServicesOperations( self._client, self.config, self._serialize, self._deserialize) diff --git a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/version.py b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/version.py index 9bd1dfac7ecb..93deb1a4d113 100644 --- a/azure-mgmt-servicefabric/azure/mgmt/servicefabric/version.py +++ b/azure-mgmt-servicefabric/azure/mgmt/servicefabric/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.2.0" +VERSION = "2019-03-01-preview" diff --git a/azure-mgmt-servicefabric/setup.py b/azure-mgmt-servicefabric/setup.py index 16470da78edc..a6e1daec7a4b 100644 --- a/azure-mgmt-servicefabric/setup.py +++ b/azure-mgmt-servicefabric/setup.py @@ -53,6 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com',