diff --git a/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models.py b/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models.py index 8c92f4397e25..5c79c983b994 100644 --- a/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models.py +++ b/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models.py @@ -1957,12 +1957,15 @@ class ManagedCluster(Resource): :param fabric_settings: The list of custom fabric settings to configure the cluster. :type fabric_settings: - ~azure.mgmt.servicefabric.models.SettingsSectionDescription + list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] + :param use_test_extension: Use service fabric test vm extension, by + default it's false. + :type use_test_extension: bool :ivar provisioning_state: The provisioning state of the managed cluster - resource. Possible values include: 'Updating', 'Succeeded', 'Failed', - 'Canceled' - :vartype provisioning_state: str or - ~azure.mgmt.servicefabric.models.ProvisioningState + resource. Possible values include: 'None', 'Creating', 'Created', + 'Updating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'Deleted', + 'Other' + :vartype provisioning_state: 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 @@ -2022,7 +2025,8 @@ class ManagedCluster(Resource): 'load_balancing_rules': {'key': 'properties.loadBalancingRules', 'type': '[LoadBalancingRule]'}, 'clients': {'key': 'properties.clients', 'type': '[ClientCertificate]'}, 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, - 'fabric_settings': {'key': 'properties.fabricSettings', 'type': 'SettingsSectionDescription'}, + 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, + 'use_test_extension': {'key': 'properties.useTestExtension', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, 'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'}, @@ -2046,6 +2050,7 @@ def __init__(self, **kwargs): self.clients = kwargs.get('clients', None) self.azure_active_directory = kwargs.get('azure_active_directory', None) self.fabric_settings = kwargs.get('fabric_settings', None) + self.use_test_extension = kwargs.get('use_test_extension', None) self.provisioning_state = None self.cluster_code_version = kwargs.get('cluster_code_version', None) self.cluster_upgrade_mode = kwargs.get('cluster_upgrade_mode', None) @@ -2065,16 +2070,16 @@ class ManagedClusterUpdateParameters(Model): :type http_gateway_connection_port: int :param load_balancing_rules: Describes a load balancing rule. :type load_balancing_rules: - ~azure.mgmt.servicefabric.models.LoadBalancingRule + list[~azure.mgmt.servicefabric.models.LoadBalancingRule] :param clients: client certificates for the cluster. - :type clients: ~azure.mgmt.servicefabric.models.ClientCertificate + :type clients: list[~azure.mgmt.servicefabric.models.ClientCertificate] :param azure_active_directory: Azure active directory. :type azure_active_directory: ~azure.mgmt.servicefabric.models.AzureActiveDirectory :param fabric_settings: The list of custom fabric settings to configure the cluster. :type fabric_settings: - ~azure.mgmt.servicefabric.models.SettingsSectionDescription + list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] :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 @@ -2103,10 +2108,10 @@ class ManagedClusterUpdateParameters(Model): _attribute_map = { 'client_connection_port': {'key': 'properties.clientConnectionPort', 'type': 'int'}, 'http_gateway_connection_port': {'key': 'properties.httpGatewayConnectionPort', 'type': 'int'}, - 'load_balancing_rules': {'key': 'properties.loadBalancingRules', 'type': 'LoadBalancingRule'}, - 'clients': {'key': 'properties.clients', 'type': 'ClientCertificate'}, + 'load_balancing_rules': {'key': 'properties.loadBalancingRules', 'type': '[LoadBalancingRule]'}, + 'clients': {'key': 'properties.clients', 'type': '[ClientCertificate]'}, 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, - 'fabric_settings': {'key': 'properties.fabricSettings', 'type': 'SettingsSectionDescription'}, + 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, 'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'}, 'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'}, @@ -2365,6 +2370,11 @@ class NodeType(ManagedProxyResource): :param vm_extensions: virtual machine extensions. Set of extensions that should be installed onto the virtual machines. :type vm_extensions: list[~azure.mgmt.servicefabric.models.VMSSExtension] + :ivar provisioning_state: The provisioning state of the managed cluster + resource. Possible values include: 'None', 'Creating', 'Created', + 'Updating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'Deleted', + 'Other' + :vartype provisioning_state: str or ~azure.mgmt.servicefabric.models.enum """ _validation = { @@ -2374,6 +2384,7 @@ class NodeType(ManagedProxyResource): 'is_primary': {'required': True}, 'vm_instance_count': {'required': True, 'maximum': 2147483647, 'minimum': 1}, 'disk_size_in_gb': {'required': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -2395,6 +2406,7 @@ class NodeType(ManagedProxyResource): 'vm_image_version': {'key': 'properties.vmImageVersion', 'type': 'str'}, 'vm_secrets': {'key': 'properties.vmSecrets', 'type': '[VaultSecretGroup]'}, 'vm_extensions': {'key': 'properties.vmExtensions', 'type': '[VMSSExtension]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, } def __init__(self, **kwargs): @@ -2413,6 +2425,7 @@ def __init__(self, **kwargs): self.vm_image_version = kwargs.get('vm_image_version', None) self.vm_secrets = kwargs.get('vm_secrets', None) self.vm_extensions = kwargs.get('vm_extensions', None) + self.provisioning_state = None class NodeTypeActionParameters(Model): @@ -3824,6 +3837,10 @@ class VMSSExtension(Model): :param name: Required. The name of the extension. :type name: str + :param force_update_tag: If a value is provided and is different from the + previous value, the extension handler will be forced to update even if the + extension configuration has not changed. + :type force_update_tag: str :param publisher: Required. The name of the extension handler publisher. :type publisher: str :param type: Required. Specifies the type of the extension; an example is @@ -3837,9 +3854,6 @@ class VMSSExtension(Model): deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true. :type auto_upgrade_minor_version: bool - :param enable_automatic_upgrade: Indicates if the extension will upgrade - automatically. - :type enable_automatic_upgrade: bool :param settings: Json formatted public settings for the extension. :type settings: object :param protected_settings: The extension can contain either @@ -3849,6 +3863,9 @@ class VMSSExtension(Model): :ivar provisioning_state: The provisioning state, which only appears in the response. :vartype provisioning_state: str + :param provision_after_extensions: Collection of extension names after + which this extension needs to be provisioned. + :type provision_after_extensions: list[str] """ _validation = { @@ -3861,24 +3878,26 @@ class VMSSExtension(Model): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, + 'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'}, 'publisher': {'key': 'properties.publisher', 'type': 'str'}, 'type': {'key': 'properties.type', 'type': 'str'}, 'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'}, 'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'}, - 'enable_automatic_upgrade': {'key': 'properties.enableAutomaticUpgrade', 'type': 'bool'}, 'settings': {'key': 'properties.settings', 'type': 'object'}, 'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'provision_after_extensions': {'key': 'properties.provisionAfterExtensions', 'type': '[str]'}, } def __init__(self, **kwargs): super(VMSSExtension, self).__init__(**kwargs) self.name = kwargs.get('name', None) + self.force_update_tag = kwargs.get('force_update_tag', None) self.publisher = kwargs.get('publisher', None) self.type = kwargs.get('type', None) self.type_handler_version = kwargs.get('type_handler_version', None) self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None) - self.enable_automatic_upgrade = kwargs.get('enable_automatic_upgrade', None) self.settings = kwargs.get('settings', None) self.protected_settings = kwargs.get('protected_settings', None) self.provisioning_state = None + self.provision_after_extensions = kwargs.get('provision_after_extensions', None) diff --git a/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models_py3.py b/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models_py3.py index bd7a3bc73e27..143b97c8a193 100644 --- a/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models_py3.py +++ b/sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models_py3.py @@ -1957,12 +1957,15 @@ class ManagedCluster(Resource): :param fabric_settings: The list of custom fabric settings to configure the cluster. :type fabric_settings: - ~azure.mgmt.servicefabric.models.SettingsSectionDescription + list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] + :param use_test_extension: Use service fabric test vm extension, by + default it's false. + :type use_test_extension: bool :ivar provisioning_state: The provisioning state of the managed cluster - resource. Possible values include: 'Updating', 'Succeeded', 'Failed', - 'Canceled' - :vartype provisioning_state: str or - ~azure.mgmt.servicefabric.models.ProvisioningState + resource. Possible values include: 'None', 'Creating', 'Created', + 'Updating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'Deleted', + 'Other' + :vartype provisioning_state: 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 @@ -2022,7 +2025,8 @@ class ManagedCluster(Resource): 'load_balancing_rules': {'key': 'properties.loadBalancingRules', 'type': '[LoadBalancingRule]'}, 'clients': {'key': 'properties.clients', 'type': '[ClientCertificate]'}, 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, - 'fabric_settings': {'key': 'properties.fabricSettings', 'type': 'SettingsSectionDescription'}, + 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, + 'use_test_extension': {'key': 'properties.useTestExtension', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, 'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'}, @@ -2031,7 +2035,7 @@ class ManagedCluster(Resource): 'sku': {'key': 'sku', 'type': 'Sku'}, } - def __init__(self, *, location: str, dns_name: str, admin_user_name: str, tags=None, client_connection_port: int=19000, http_gateway_connection_port: int=19080, admin_password: str=None, load_balancing_rules=None, clients=None, azure_active_directory=None, fabric_settings=None, cluster_code_version: str=None, cluster_upgrade_mode=None, cluster_upgrade_description=None, reverse_proxy_endpoint_port: int=None, sku=None, **kwargs) -> None: + def __init__(self, *, location: str, dns_name: str, admin_user_name: str, tags=None, client_connection_port: int=19000, http_gateway_connection_port: int=19080, admin_password: str=None, load_balancing_rules=None, clients=None, azure_active_directory=None, fabric_settings=None, use_test_extension: bool=None, cluster_code_version: str=None, cluster_upgrade_mode=None, cluster_upgrade_description=None, reverse_proxy_endpoint_port: int=None, sku=None, **kwargs) -> None: super(ManagedCluster, self).__init__(location=location, tags=tags, **kwargs) self.dns_name = dns_name self.fqdn = None @@ -2046,6 +2050,7 @@ def __init__(self, *, location: str, dns_name: str, admin_user_name: str, tags=N self.clients = clients self.azure_active_directory = azure_active_directory self.fabric_settings = fabric_settings + self.use_test_extension = use_test_extension self.provisioning_state = None self.cluster_code_version = cluster_code_version self.cluster_upgrade_mode = cluster_upgrade_mode @@ -2065,16 +2070,16 @@ class ManagedClusterUpdateParameters(Model): :type http_gateway_connection_port: int :param load_balancing_rules: Describes a load balancing rule. :type load_balancing_rules: - ~azure.mgmt.servicefabric.models.LoadBalancingRule + list[~azure.mgmt.servicefabric.models.LoadBalancingRule] :param clients: client certificates for the cluster. - :type clients: ~azure.mgmt.servicefabric.models.ClientCertificate + :type clients: list[~azure.mgmt.servicefabric.models.ClientCertificate] :param azure_active_directory: Azure active directory. :type azure_active_directory: ~azure.mgmt.servicefabric.models.AzureActiveDirectory :param fabric_settings: The list of custom fabric settings to configure the cluster. :type fabric_settings: - ~azure.mgmt.servicefabric.models.SettingsSectionDescription + list[~azure.mgmt.servicefabric.models.SettingsSectionDescription] :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 @@ -2103,10 +2108,10 @@ class ManagedClusterUpdateParameters(Model): _attribute_map = { 'client_connection_port': {'key': 'properties.clientConnectionPort', 'type': 'int'}, 'http_gateway_connection_port': {'key': 'properties.httpGatewayConnectionPort', 'type': 'int'}, - 'load_balancing_rules': {'key': 'properties.loadBalancingRules', 'type': 'LoadBalancingRule'}, - 'clients': {'key': 'properties.clients', 'type': 'ClientCertificate'}, + 'load_balancing_rules': {'key': 'properties.loadBalancingRules', 'type': '[LoadBalancingRule]'}, + 'clients': {'key': 'properties.clients', 'type': '[ClientCertificate]'}, 'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'}, - 'fabric_settings': {'key': 'properties.fabricSettings', 'type': 'SettingsSectionDescription'}, + 'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'}, 'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'}, 'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'}, 'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'}, @@ -2365,6 +2370,11 @@ class NodeType(ManagedProxyResource): :param vm_extensions: virtual machine extensions. Set of extensions that should be installed onto the virtual machines. :type vm_extensions: list[~azure.mgmt.servicefabric.models.VMSSExtension] + :ivar provisioning_state: The provisioning state of the managed cluster + resource. Possible values include: 'None', 'Creating', 'Created', + 'Updating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'Deleted', + 'Other' + :vartype provisioning_state: str or ~azure.mgmt.servicefabric.models.enum """ _validation = { @@ -2374,6 +2384,7 @@ class NodeType(ManagedProxyResource): 'is_primary': {'required': True}, 'vm_instance_count': {'required': True, 'maximum': 2147483647, 'minimum': 1}, 'disk_size_in_gb': {'required': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -2395,6 +2406,7 @@ class NodeType(ManagedProxyResource): 'vm_image_version': {'key': 'properties.vmImageVersion', 'type': 'str'}, 'vm_secrets': {'key': 'properties.vmSecrets', 'type': '[VaultSecretGroup]'}, 'vm_extensions': {'key': 'properties.vmExtensions', 'type': '[VMSSExtension]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, } def __init__(self, *, is_primary: bool, vm_instance_count: int, disk_size_in_gb: int, tags=None, placement_properties=None, capacities=None, application_ports=None, ephemeral_ports=None, vm_size: str=None, vm_image_publisher: str=None, vm_image_offer: str=None, vm_image_sku: str=None, vm_image_version: str=None, vm_secrets=None, vm_extensions=None, **kwargs) -> None: @@ -2413,6 +2425,7 @@ def __init__(self, *, is_primary: bool, vm_instance_count: int, disk_size_in_gb: self.vm_image_version = vm_image_version self.vm_secrets = vm_secrets self.vm_extensions = vm_extensions + self.provisioning_state = None class NodeTypeActionParameters(Model): @@ -3824,6 +3837,10 @@ class VMSSExtension(Model): :param name: Required. The name of the extension. :type name: str + :param force_update_tag: If a value is provided and is different from the + previous value, the extension handler will be forced to update even if the + extension configuration has not changed. + :type force_update_tag: str :param publisher: Required. The name of the extension handler publisher. :type publisher: str :param type: Required. Specifies the type of the extension; an example is @@ -3837,9 +3854,6 @@ class VMSSExtension(Model): deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true. :type auto_upgrade_minor_version: bool - :param enable_automatic_upgrade: Indicates if the extension will upgrade - automatically. - :type enable_automatic_upgrade: bool :param settings: Json formatted public settings for the extension. :type settings: object :param protected_settings: The extension can contain either @@ -3849,6 +3863,9 @@ class VMSSExtension(Model): :ivar provisioning_state: The provisioning state, which only appears in the response. :vartype provisioning_state: str + :param provision_after_extensions: Collection of extension names after + which this extension needs to be provisioned. + :type provision_after_extensions: list[str] """ _validation = { @@ -3861,24 +3878,26 @@ class VMSSExtension(Model): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, + 'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'}, 'publisher': {'key': 'properties.publisher', 'type': 'str'}, 'type': {'key': 'properties.type', 'type': 'str'}, 'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'}, 'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'}, - 'enable_automatic_upgrade': {'key': 'properties.enableAutomaticUpgrade', 'type': 'bool'}, 'settings': {'key': 'properties.settings', 'type': 'object'}, 'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'provision_after_extensions': {'key': 'properties.provisionAfterExtensions', 'type': '[str]'}, } - def __init__(self, *, name: str, publisher: str, type: str, type_handler_version: str, auto_upgrade_minor_version: bool=None, enable_automatic_upgrade: bool=None, settings=None, protected_settings=None, **kwargs) -> None: + def __init__(self, *, name: str, publisher: str, type: str, type_handler_version: str, force_update_tag: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, provision_after_extensions=None, **kwargs) -> None: super(VMSSExtension, self).__init__(**kwargs) self.name = name + self.force_update_tag = force_update_tag self.publisher = publisher self.type = type self.type_handler_version = type_handler_version self.auto_upgrade_minor_version = auto_upgrade_minor_version - self.enable_automatic_upgrade = enable_automatic_upgrade self.settings = settings self.protected_settings = protected_settings self.provisioning_state = None + self.provision_after_extensions = provision_after_extensions