Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR azure-mgmt-servicefabric] Fix some bad output-folder for go SDK #14041

Closed
wants to merge 1 commit into from
Closed

[ReleasePR azure-mgmt-servicefabric] Fix some bad output-folder for go SDK #14041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ class ClientCertificate(Model):
:param common_name: Certificate Common name.
:type common_name: str
:param issuer_thumbprint: Issuer thumbprint for the certificate. Its only
use ehn CommonName is used.
use CommonName is used.
:type issuer_thumbprint: str
"""

Expand Down Expand Up @@ -1958,9 +1958,6 @@ class ManagedCluster(Resource):
the cluster.
:type fabric_settings:
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: 'None', 'Creating', 'Created',
'Updating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'Deleted',
Expand All @@ -1985,8 +1982,6 @@ class ManagedCluster(Resource):
upgrading the cluster.
:type cluster_upgrade_description:
~azure.mgmt.servicefabric.models.ClusterUpgradePolicy
:param reverse_proxy_endpoint_port: The endpoint used by reverse proxy.
:type reverse_proxy_endpoint_port: int
:param sku: The sku of the managed cluster
:type sku: ~azure.mgmt.servicefabric.models.Sku
"""
Expand Down Expand Up @@ -2026,12 +2021,10 @@ class ManagedCluster(Resource):
'clients': {'key': 'properties.clients', 'type': '[ClientCertificate]'},
'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'},
'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'},
'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'},
'reverse_proxy_endpoint_port': {'key': 'properties.reverseProxyEndpointPort', 'type': 'int'},
'sku': {'key': 'sku', 'type': 'Sku'},
}

Expand All @@ -2050,12 +2043,10 @@ 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)
self.cluster_upgrade_description = kwargs.get('cluster_upgrade_description', None)
self.reverse_proxy_endpoint_port = kwargs.get('reverse_proxy_endpoint_port', None)
self.sku = kwargs.get('sku', None)


Expand Down Expand Up @@ -2099,8 +2090,6 @@ class ManagedClusterUpdateParameters(Model):
upgrading the cluster.
:type cluster_upgrade_description:
~azure.mgmt.servicefabric.models.ClusterUpgradePolicy
:param reverse_proxy_endpoint_port: The endpoint used by reverse proxy.
:type reverse_proxy_endpoint_port: int
:param tags: Managed cluster update parameters
:type tags: dict[str, str]
"""
Expand All @@ -2115,7 +2104,6 @@ class ManagedClusterUpdateParameters(Model):
'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'},
'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'},
'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'},
'reverse_proxy_endpoint_port': {'key': 'properties.reverseProxyEndpointPort', 'type': 'int'},
'tags': {'key': 'tags', 'type': '{str}'},
}

Expand All @@ -2130,7 +2118,6 @@ def __init__(self, **kwargs):
self.cluster_code_version = kwargs.get('cluster_code_version', None)
self.cluster_upgrade_mode = kwargs.get('cluster_upgrade_mode', None)
self.cluster_upgrade_description = kwargs.get('cluster_upgrade_description', None)
self.reverse_proxy_endpoint_port = kwargs.get('reverse_proxy_endpoint_port', None)
self.tags = kwargs.get('tags', None)


Expand Down Expand Up @@ -2326,8 +2313,6 @@ class NodeType(ManagedProxyResource):
cannot be deleted or changed for existing clusters.
:type is_primary: bool
:param vm_instance_count: Required. The number of nodes in the node type.
This count should match the capacity property in the corresponding
VirtualMachineScaleSet resource.
:type vm_instance_count: int
:param data_disk_size_gb: Required. Disk size for each vm in the node type
in GBs.
Expand Down Expand Up @@ -3310,7 +3295,7 @@ class Sku(Model):

All required parameters must be populated in order to send to Azure.

:param name: Required. Sku Name. Basic will hav a minimum of 3 seed nodes
:param name: Required. Sku Name. Basic will have a minimum of 3 seed nodes
and Standard a minimum of 5. Basic only allows 1 node type. Possible
values include: 'Basic', 'Standard'
:type name: str or ~azure.mgmt.servicefabric.models.enum
Expand Down
23 changes: 4 additions & 19 deletions sdk/servicefabric/azure-mgmt-servicefabric/azure/mgmt/servicefabric/models/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ class ClientCertificate(Model):
:param common_name: Certificate Common name.
:type common_name: str
:param issuer_thumbprint: Issuer thumbprint for the certificate. Its only
use ehn CommonName is used.
use CommonName is used.
:type issuer_thumbprint: str
"""

Expand Down Expand Up @@ -1958,9 +1958,6 @@ class ManagedCluster(Resource):
the cluster.
:type fabric_settings:
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: 'None', 'Creating', 'Created',
'Updating', 'Succeeded', 'Failed', 'Canceled', 'Deleting', 'Deleted',
Expand All @@ -1985,8 +1982,6 @@ class ManagedCluster(Resource):
upgrading the cluster.
:type cluster_upgrade_description:
~azure.mgmt.servicefabric.models.ClusterUpgradePolicy
:param reverse_proxy_endpoint_port: The endpoint used by reverse proxy.
:type reverse_proxy_endpoint_port: int
:param sku: The sku of the managed cluster
:type sku: ~azure.mgmt.servicefabric.models.Sku
"""
Expand Down Expand Up @@ -2026,16 +2021,14 @@ class ManagedCluster(Resource):
'clients': {'key': 'properties.clients', 'type': '[ClientCertificate]'},
'azure_active_directory': {'key': 'properties.azureActiveDirectory', 'type': 'AzureActiveDirectory'},
'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'},
'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'},
'reverse_proxy_endpoint_port': {'key': 'properties.reverseProxyEndpointPort', 'type': 'int'},
'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, 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:
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, sku=None, **kwargs) -> None:
super(ManagedCluster, self).__init__(location=location, tags=tags, **kwargs)
self.dns_name = dns_name
self.fqdn = None
Expand All @@ -2050,12 +2043,10 @@ 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
self.cluster_upgrade_description = cluster_upgrade_description
self.reverse_proxy_endpoint_port = reverse_proxy_endpoint_port
self.sku = sku


Expand Down Expand Up @@ -2099,8 +2090,6 @@ class ManagedClusterUpdateParameters(Model):
upgrading the cluster.
:type cluster_upgrade_description:
~azure.mgmt.servicefabric.models.ClusterUpgradePolicy
:param reverse_proxy_endpoint_port: The endpoint used by reverse proxy.
:type reverse_proxy_endpoint_port: int
:param tags: Managed cluster update parameters
:type tags: dict[str, str]
"""
Expand All @@ -2115,11 +2104,10 @@ class ManagedClusterUpdateParameters(Model):
'cluster_code_version': {'key': 'properties.clusterCodeVersion', 'type': 'str'},
'cluster_upgrade_mode': {'key': 'properties.clusterUpgradeMode', 'type': 'str'},
'cluster_upgrade_description': {'key': 'properties.clusterUpgradeDescription', 'type': 'ClusterUpgradePolicy'},
'reverse_proxy_endpoint_port': {'key': 'properties.reverseProxyEndpointPort', 'type': 'int'},
'tags': {'key': 'tags', 'type': '{str}'},
}

def __init__(self, *, client_connection_port: int=None, http_gateway_connection_port: int=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, tags=None, **kwargs) -> None:
def __init__(self, *, client_connection_port: int=None, http_gateway_connection_port: int=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, tags=None, **kwargs) -> None:
super(ManagedClusterUpdateParameters, self).__init__(**kwargs)
self.client_connection_port = client_connection_port
self.http_gateway_connection_port = http_gateway_connection_port
Expand All @@ -2130,7 +2118,6 @@ def __init__(self, *, client_connection_port: int=None, http_gateway_connection_
self.cluster_code_version = cluster_code_version
self.cluster_upgrade_mode = cluster_upgrade_mode
self.cluster_upgrade_description = cluster_upgrade_description
self.reverse_proxy_endpoint_port = reverse_proxy_endpoint_port
self.tags = tags


Expand Down Expand Up @@ -2326,8 +2313,6 @@ class NodeType(ManagedProxyResource):
cannot be deleted or changed for existing clusters.
:type is_primary: bool
:param vm_instance_count: Required. The number of nodes in the node type.
This count should match the capacity property in the corresponding
VirtualMachineScaleSet resource.
:type vm_instance_count: int
:param data_disk_size_gb: Required. Disk size for each vm in the node type
in GBs.
Expand Down Expand Up @@ -3310,7 +3295,7 @@ class Sku(Model):

All required parameters must be populated in order to send to Azure.

:param name: Required. Sku Name. Basic will hav a minimum of 3 seed nodes
:param name: Required. Sku Name. Basic will have a minimum of 3 seed nodes
and Standard a minimum of 5. Basic only allows 1 node type. Possible
values include: 'Basic', 'Standard'
:type name: str or ~azure.mgmt.servicefabric.models.enum
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicefabric/azure-mgmt-servicefabric/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
pass

# Version extraction inspired from 'requests'
with open(os.path.join(package_folder_path, 'version.py')
with open(os.path.join(package_folder_path, 'version.py')
if os.path.exists(os.path.join(package_folder_path, 'version.py'))
else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
Expand Down