Generated from 70adfab06b35f90ca4c799542cb8c9de22a834c2 (#2567)

Fix SFRP map types and error model

azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/__init__.py

@@ -9,48 +9,23 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
+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
@@ -59,59 +34,67 @@
 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 .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_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 .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 .proxy_resource import ProxyResource
+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 .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 .operation_result_paged import OperationResultPaged
 from .service_fabric_management_client_enums import (
     ProvisioningState,
+    ServiceKind,
+    ServiceCorrelationScheme,
+    ServiceLoadMetricWeight,
+    ServicePlacementPolicyType,
+    PartitionScheme,
+    MoveCost,
 )
 
 __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',
@@ -120,11 +103,44 @@
     'ClusterCodeVersionsListResult',
     'ClusterListResult',
     'ClusterUpdateParameters',
-    'ErrorModel', 'ErrorModelException',
     'OperationResult',
-    'ProxyResource',
     'Resource',
-    'ServiceTypeDeltaHealthPolicy',
+    'ErrorModelError',
+    'ErrorModel', 'ErrorModelException',
+    'ApplicationMetricDescription',
+    'ServiceCorrelationDescription',
+    'ServiceLoadMetricDescription',
+    'ServicePlacementPolicyDescription',
+    'PartitionSchemeDescription',
+    'NamedPartitionSchemeDescription',
+    'SingletonPartitionSchemeDescription',
+    'UniformInt64RangePartitionSchemeDescription',
+    'ApplicationResource',
+    'ApplicationResourceList',
+    'RollingUpgradeMonitoringPolicy',
+    'ApplicationUpgradePolicy',
+    'ApplicationResourceUpdate',
+    'ApplicationTypeResource',
+    'ApplicationTypeResourceList',
+    'ApplicationTypeVersionResource',
+    'ApplicationTypeVersionResourceList',
+    'ProxyResource',
+    'ServiceResourceProperties',
+    'ServiceResource',
+    'ServiceResourceList',
+    'ServiceResourcePropertiesBase',
+    'ServiceResourceUpdateProperties',
+    'ServiceResourceUpdate',
+    'StatefulServiceProperties',
+    'StatefulServiceUpdateProperties',
+    'StatelessServiceProperties',
+    'StatelessServiceUpdateProperties',
     'OperationResultPaged',
     'ProvisioningState',
+    'ServiceKind',
+    'ServiceCorrelationScheme',
+    'ServiceLoadMetricWeight',
+    'ServicePlacementPolicyType',
+    'PartitionScheme',
+    'MoveCost',
 ]

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, default_service_type_delta_health_policy=None, service_type_delta_health_policies=None):
+        super(ApplicationDeltaHealthPolicy, self).__init__()
+        self.default_service_type_delta_health_policy = default_service_type_delta_health_policy
+        self.service_type_delta_health_policies = service_type_delta_health_policies

azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/application_health_policy.py

@@ -17,6 +17,14 @@ class ApplicationHealthPolicy(Model):
     one of its children entities.
     .
 
+    :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_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]
     :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
@@ -33,24 +41,30 @@ class ApplicationHealthPolicy(Model):
      nodes. Default percentage is zero.
      . Default value: 0 .
     :type max_percent_unhealthy_deployed_applications: int
-    :param default_service_type_health_policy:
-    :type default_service_type_health_policy:
+    :param default_service_type_health_policy1: The health policy used by
+     default to evaluate the health of a service type.
+    :type default_service_type_health_policy1:
      ~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_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.ServiceTypeHealthPolicy]
     """
 
     _attribute_map = {
+        'default_service_type_health_policy': {'key': 'defaultServiceTypeHealthPolicy', 'type': 'ServiceTypeHealthPolicy'},
+        'service_type_health_policies': {'key': 'serviceTypeHealthPolicies', 'type': '{ServiceTypeHealthPolicy}'},
         '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_policy1': {'key': 'DefaultServiceTypeHealthPolicy', 'type': 'ServiceTypeHealthPolicy'},
+        'service_type_health_policy_map': {'key': 'ServiceTypeHealthPolicyMap', 'type': '{ServiceTypeHealthPolicy}'},
     }
 
-    def __init__(self, consider_warning_as_error=False, max_percent_unhealthy_deployed_applications=0, default_service_type_health_policy=None, service_type_health_policy_map=None):
+    def __init__(self, default_service_type_health_policy=None, service_type_health_policies=None, consider_warning_as_error=False, max_percent_unhealthy_deployed_applications=0, default_service_type_health_policy1=None, service_type_health_policy_map=None):
         super(ApplicationHealthPolicy, self).__init__()
+        self.default_service_type_health_policy = default_service_type_health_policy
+        self.service_type_health_policies = service_type_health_policies
         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.default_service_type_health_policy1 = default_service_type_health_policy1
         self.service_type_health_policy_map = service_type_health_policy_map