Skip to content

Commit 2902eee

Browse files
author
SDKAuto
committed
CodeGen from PR 14749 in Azure/azure-rest-api-specs
Merge 6a5f970e9f7e2ed91bf0c11289daa8743f28e131 into 682c9680fd6ac7746d701bcf0c69948a3199671a
1 parent 03516c3 commit 2902eee

File tree

4 files changed

+68
-197
lines changed

4 files changed

+68
-197
lines changed

sdk/servicefabric/azure-mgmt-servicefabric/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
include _meta.json
12
recursive-include tests *.py *.yaml
23
include *.md
34
include azure/__init__.py
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"autorest": "V2",
3+
"use": "@microsoft.azure/autorest.python@~4.0.71",
4+
"commit": "74244c59db8f94a3993677ce0f83e9d68455d784",
5+
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
6+
"autorest_command": "autorest specification/servicefabric/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk [email protected]/autorest.python@~4.0.71 --version=V2",
7+
"readme": "specification/servicefabric/resource-manager/readme.md"
8+
}

sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models.py

Lines changed: 28 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,8 @@ class ClientCertificate(Model):
900900
:type thumbprint: str
901901
:param common_name: Certificate Common name.
902902
:type common_name: str
903-
:param issuer_thumbprint: Issuer thumbprint for the certificate. Its only
904-
use ehn CommonName is used.
903+
:param issuer_thumbprint: Issuer thumbprint for the certificate. Only used
904+
together with CommonName.
905905
:type issuer_thumbprint: str
906906
"""
907907

@@ -1902,34 +1902,9 @@ class ManagedCluster(Resource):
19021902
:ivar cluster_id: A service generated unique identifier for the cluster
19031903
resource.
19041904
:vartype cluster_id: str
1905-
:ivar cluster_state: The current state of the cluster.
1906-
- WaitingForNodes - Indicates that the cluster resource is created and the
1907-
resource provider is waiting for Service Fabric VM extension to boot up
1908-
and report to it.
1909-
- Deploying - Indicates that the Service Fabric runtime is being installed
1910-
on the VMs. Cluster resource will be in this state until the cluster boots
1911-
up and system services are up.
1912-
- BaselineUpgrade - Indicates that the cluster is upgrading to establishes
1913-
the cluster version. This upgrade is automatically initiated when the
1914-
cluster boots up for the first time.
1915-
- UpdatingUserConfiguration - Indicates that the cluster is being upgraded
1916-
with the user provided configuration.
1917-
- UpdatingUserCertificate - Indicates that the cluster is being upgraded
1918-
with the user provided certificate.
1919-
- UpdatingInfrastructure - Indicates that the cluster is being upgraded
1920-
with the latest Service Fabric runtime version. This happens only when the
1921-
**upgradeMode** is set to 'Automatic'.
1922-
- EnforcingClusterVersion - Indicates that cluster is on a different
1923-
version than expected and the cluster is being upgraded to the expected
1924-
version.
1925-
- UpgradeServiceUnreachable - Indicates that the system service in the
1926-
cluster is no longer polling the Resource Provider. Clusters in this state
1927-
cannot be managed by the Resource Provider.
1928-
- AutoScale - Indicates that the ReliabilityLevel of the cluster is being
1929-
adjusted.
1930-
- Ready - Indicates that the cluster is in a stable state.
1931-
. Possible values include: 'WaitingForNodes', 'Deploying',
1932-
'BaselineUpgrade', 'UpdatingUserConfiguration', 'UpdatingUserCertificate',
1905+
:ivar cluster_state: The current state of the cluster. Possible values
1906+
include: 'WaitingForNodes', 'Deploying', 'BaselineUpgrade',
1907+
'UpdatingUserConfiguration', 'UpdatingUserCertificate',
19331908
'UpdatingInfrastructure', 'EnforcingClusterVersion',
19341909
'UpgradeServiceUnreachable', 'AutoScale', 'Ready'
19351910
:vartype cluster_state: str or ~azure.mgmt.servicefabric.models.enum
@@ -1958,9 +1933,6 @@ class ManagedCluster(Resource):
19581933
the cluster.
19591934
:type fabric_settings:
19601935
list[~azure.mgmt.servicefabric.models.SettingsSectionDescription]
1961-
:param use_test_extension: Use service fabric test vm extension, by
1962-
default it's false.
1963-
:type use_test_extension: bool
19641936
:ivar provisioning_state: The provisioning state of the managed cluster
19651937
resource. Possible values include: 'None', 'Creating', 'Created',
19661938
'Updating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'Deleted',
@@ -1972,21 +1944,8 @@ class ManagedCluster(Resource):
19721944
clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of
19731945
available version for existing clusters use **availableClusterVersions**.
19741946
:type cluster_code_version: str
1975-
:param cluster_upgrade_mode: The upgrade mode of the cluster when new
1976-
Service Fabric runtime version is available.
1977-
- Automatic - The cluster will be automatically upgraded to the latest
1978-
Service Fabric runtime version as soon as it is available.
1979-
- Manual - The cluster will not be automatically upgraded to the latest
1980-
Service Fabric runtime version. The cluster is upgraded by setting the
1981-
**clusterCodeVersion** property in the cluster resource.
1982-
. Possible values include: 'Automatic', 'Manual'
1983-
:type cluster_upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum
1984-
:param cluster_upgrade_description: Describes the policy used when
1985-
upgrading the cluster.
1986-
:type cluster_upgrade_description:
1987-
~azure.mgmt.servicefabric.models.ClusterUpgradePolicy
1988-
:param reverse_proxy_endpoint_port: The endpoint used by reverse proxy.
1989-
:type reverse_proxy_endpoint_port: int
1947+
:param addon_features: client certificates for the cluster.
1948+
:type addon_features: list[str]
19901949
:param sku: The sku of the managed cluster
19911950
:type sku: ~azure.mgmt.servicefabric.models.Sku
19921951
"""
@@ -2026,12 +1985,9 @@ class ManagedCluster(Resource):
20261985
'clients': {'key': 'properties.clients', 'type': '[ClientCertificate]'},
20271986
'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'},
20281987
'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'},
2029-
'use_test_extension': {'key': 'properties.useTestExtension', 'type': 'bool'},
20301988
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
20311989
'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'},
2032-
'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'},
2033-
'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'},
2034-
'reverse_proxy_endpoint_port': {'key': 'properties.reverseProxyEndpointPort', 'type': 'int'},
1990+
'addon_features': {'key': 'properties.addonFeatures', 'type': '[str]'},
20351991
'sku': {'key': 'sku', 'type': 'Sku'},
20361992
}
20371993

@@ -2050,12 +2006,9 @@ def __init__(self, **kwargs):
20502006
self.clients = kwargs.get('clients', None)
20512007
self.azure_active_directory = kwargs.get('azure_active_directory', None)
20522008
self.fabric_settings = kwargs.get('fabric_settings', None)
2053-
self.use_test_extension = kwargs.get('use_test_extension', None)
20542009
self.provisioning_state = None
20552010
self.cluster_code_version = kwargs.get('cluster_code_version', None)
2056-
self.cluster_upgrade_mode = kwargs.get('cluster_upgrade_mode', None)
2057-
self.cluster_upgrade_description = kwargs.get('cluster_upgrade_description', None)
2058-
self.reverse_proxy_endpoint_port = kwargs.get('reverse_proxy_endpoint_port', None)
2011+
self.addon_features = kwargs.get('addon_features', None)
20592012
self.sku = kwargs.get('sku', None)
20602013

20612014

@@ -2068,7 +2021,7 @@ class ManagedClusterUpdateParameters(Model):
20682021
:param http_gateway_connection_port: The port used for http connections to
20692022
the cluster.
20702023
:type http_gateway_connection_port: int
2071-
:param load_balancing_rules: Describes a load balancing rule.
2024+
:param load_balancing_rules: Describes load balancing rules.
20722025
:type load_balancing_rules:
20732026
list[~azure.mgmt.servicefabric.models.LoadBalancingRule]
20742027
:param clients: client certificates for the cluster.
@@ -2086,21 +2039,8 @@ class ManagedClusterUpdateParameters(Model):
20862039
clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of
20872040
available version for existing clusters use **availableClusterVersions**.
20882041
:type cluster_code_version: str
2089-
:param cluster_upgrade_mode: The upgrade mode of the cluster when new
2090-
Service Fabric runtime version is available.
2091-
- Automatic - The cluster will be automatically upgraded to the latest
2092-
Service Fabric runtime version as soon as it is available.
2093-
- Manual - The cluster will not be automatically upgraded to the latest
2094-
Service Fabric runtime version. The cluster is upgraded by setting the
2095-
**clusterCodeVersion** property in the cluster resource.
2096-
. Possible values include: 'Automatic', 'Manual'
2097-
:type cluster_upgrade_mode: str or ~azure.mgmt.servicefabric.models.enum
2098-
:param cluster_upgrade_description: Describes the policy used when
2099-
upgrading the cluster.
2100-
:type cluster_upgrade_description:
2101-
~azure.mgmt.servicefabric.models.ClusterUpgradePolicy
2102-
:param reverse_proxy_endpoint_port: The endpoint used by reverse proxy.
2103-
:type reverse_proxy_endpoint_port: int
2042+
:param addon_features: client certificates for the cluster.
2043+
:type addon_features: list[str]
21042044
:param tags: Managed cluster update parameters
21052045
:type tags: dict[str, str]
21062046
"""
@@ -2113,9 +2053,7 @@ class ManagedClusterUpdateParameters(Model):
21132053
'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'},
21142054
'fabric_settings': {'key': 'properties.fabricSettings', 'type': '[SettingsSectionDescription]'},
21152055
'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'},
2116-
'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'},
2117-
'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'},
2118-
'reverse_proxy_endpoint_port': {'key': 'properties.reverseProxyEndpointPort', 'type': 'int'},
2056+
'addon_features': {'key': 'properties.addonFeatures', 'type': '[str]'},
21192057
'tags': {'key': 'tags', 'type': '{str}'},
21202058
}
21212059

@@ -2128,9 +2066,7 @@ def __init__(self, **kwargs):
21282066
self.azure_active_directory = kwargs.get('azure_active_directory', None)
21292067
self.fabric_settings = kwargs.get('fabric_settings', None)
21302068
self.cluster_code_version = kwargs.get('cluster_code_version', None)
2131-
self.cluster_upgrade_mode = kwargs.get('cluster_upgrade_mode', None)
2132-
self.cluster_upgrade_description = kwargs.get('cluster_upgrade_description', None)
2133-
self.reverse_proxy_endpoint_port = kwargs.get('reverse_proxy_endpoint_port', None)
2069+
self.addon_features = kwargs.get('addon_features', None)
21342070
self.tags = kwargs.get('tags', None)
21352071

21362072

@@ -2326,8 +2262,6 @@ class NodeType(ManagedProxyResource):
23262262
cannot be deleted or changed for existing clusters.
23272263
:type is_primary: bool
23282264
:param vm_instance_count: Required. The number of nodes in the node type.
2329-
This count should match the capacity property in the corresponding
2330-
VirtualMachineScaleSet resource.
23312265
:type vm_instance_count: int
23322266
:param data_disk_size_gb: Required. Disk size for each vm in the node type
23332267
in GBs.
@@ -2547,9 +2481,7 @@ def __init__(self, **kwargs):
25472481
class NodeTypeUpdateParameters(Model):
25482482
"""Node type update request.
25492483
2550-
:param vm_instance_count: The number of nodes in the node type. This count
2551-
should match the capacity property in the corresponding
2552-
VirtualMachineScaleSet resource.
2484+
:param vm_instance_count: The number of nodes in the node type.
25532485
:type vm_instance_count: int
25542486
:param placement_properties: The placement tags applied to nodes in the
25552487
node type, which can be used to indicate where certain services (workload)
@@ -3310,9 +3242,8 @@ class Sku(Model):
33103242
33113243
All required parameters must be populated in order to send to Azure.
33123244
3313-
:param name: Required. Sku Name. Basic will hav a minimum of 3 seed nodes
3314-
and Standard a minimum of 5. Basic only allows 1 node type. Possible
3315-
values include: 'Basic', 'Standard'
3245+
:param name: Required. Sku Name. Possible values include: 'Basic',
3246+
'Standard'
33163247
:type name: str or ~azure.mgmt.servicefabric.models.enum
33173248
"""
33183249

@@ -3837,10 +3768,6 @@ class VMSSExtension(Model):
38373768
38383769
:param name: Required. The name of the extension.
38393770
:type name: str
3840-
:param force_update_tag: If a value is provided and is different from the
3841-
previous value, the extension handler will be forced to update even if the
3842-
extension configuration has not changed.
3843-
:type force_update_tag: str
38443771
:param publisher: Required. The name of the extension handler publisher.
38453772
:type publisher: str
38463773
:param type: Required. Specifies the type of the extension; an example is
@@ -3860,12 +3787,16 @@ class VMSSExtension(Model):
38603787
protectedSettings or protectedSettingsFromKeyVault or no protected
38613788
settings at all.
38623789
:type protected_settings: object
3863-
:ivar provisioning_state: The provisioning state, which only appears in
3864-
the response.
3865-
:vartype provisioning_state: str
3790+
:param force_update_tag: If a value is provided and is different from the
3791+
previous value, the extension handler will be forced to update even if the
3792+
extension configuration has not changed.
3793+
:type force_update_tag: str
38663794
:param provision_after_extensions: Collection of extension names after
38673795
which this extension needs to be provisioned.
38683796
:type provision_after_extensions: list[str]
3797+
:ivar provisioning_state: The provisioning state, which only appears in
3798+
the response.
3799+
:vartype provisioning_state: str
38693800
"""
38703801

38713802
_validation = {
@@ -3878,26 +3809,26 @@ class VMSSExtension(Model):
38783809

38793810
_attribute_map = {
38803811
'name': {'key': 'name', 'type': 'str'},
3881-
'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
38823812
'publisher': {'key': 'properties.publisher', 'type': 'str'},
38833813
'type': {'key': 'properties.type', 'type': 'str'},
38843814
'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
38853815
'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
38863816
'settings': {'key': 'properties.settings', 'type': 'object'},
38873817
'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
3888-
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
3818+
'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
38893819
'provision_after_extensions': {'key': 'properties.provisionAfterExtensions', 'type': '[str]'},
3820+
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
38903821
}
38913822

38923823
def __init__(self, **kwargs):
38933824
super(VMSSExtension, self).__init__(**kwargs)
38943825
self.name = kwargs.get('name', None)
3895-
self.force_update_tag = kwargs.get('force_update_tag', None)
38963826
self.publisher = kwargs.get('publisher', None)
38973827
self.type = kwargs.get('type', None)
38983828
self.type_handler_version = kwargs.get('type_handler_version', None)
38993829
self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
39003830
self.settings = kwargs.get('settings', None)
39013831
self.protected_settings = kwargs.get('protected_settings', None)
3902-
self.provisioning_state = None
3832+
self.force_update_tag = kwargs.get('force_update_tag', None)
39033833
self.provision_after_extensions = kwargs.get('provision_after_extensions', None)
3834+
self.provisioning_state = None

0 commit comments

Comments
 (0)