diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py index d8b5954ac92b..5c07709435e0 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py @@ -15,9 +15,7 @@ class Sku(Model): """Describes a virtual machine scale set sku. - :param name: The sku name. Possible values are: **Aligned** for managed - disks, and **Classic** for unmanaged disks. Default value is Classic, if - not specified. + :param name: The sku name. :type name: str :param tier: Specifies the tier of virtual machines in a scale set.

Possible Values:

**Standard**

**Basic** diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py index 781632d90337..f6bc74afaadc 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py @@ -15,9 +15,7 @@ class Sku(Model): """Describes a virtual machine scale set sku. - :param name: The sku name. Possible values are: **Aligned** for managed - disks, and **Classic** for unmanaged disks. Default value is Classic, if - not specified. + :param name: The sku name. :type name: str :param tier: Specifies the tier of virtual machines in a scale set.

Possible Values:

**Standard**

**Basic** diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py index c43e3909c23d..ca667579db68 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py @@ -29,6 +29,9 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model): :param ip_tags: The list of IP tags associated with the public IP address. :type ip_tags: list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIpTag] + :param public_ip_prefix: The PublicIPPrefix from which to allocate + publicIP addresses. + :type public_ip_prefix: ~azure.mgmt.compute.v2018_06_01.models.SubResource """ _validation = { @@ -40,6 +43,7 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model): 'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'}, 'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'}, 'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'}, + 'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'SubResource'}, } def __init__(self, **kwargs): @@ -48,3 +52,4 @@ def __init__(self, **kwargs): self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None) self.dns_settings = kwargs.get('dns_settings', None) self.ip_tags = kwargs.get('ip_tags', None) + self.public_ip_prefix = kwargs.get('public_ip_prefix', None) diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py index 1997921b01de..3d6ba42bf5f6 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py @@ -29,6 +29,9 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model): :param ip_tags: The list of IP tags associated with the public IP address. :type ip_tags: list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIpTag] + :param public_ip_prefix: The PublicIPPrefix from which to allocate + publicIP addresses. + :type public_ip_prefix: ~azure.mgmt.compute.v2018_06_01.models.SubResource """ _validation = { @@ -40,11 +43,13 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model): 'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'}, 'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'}, 'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'}, + 'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'SubResource'}, } - def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=None, ip_tags=None, **kwargs) -> None: + def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=None, ip_tags=None, public_ip_prefix=None, **kwargs) -> None: super(VirtualMachineScaleSetPublicIPAddressConfiguration, self).__init__(**kwargs) self.name = name self.idle_timeout_in_minutes = idle_timeout_in_minutes self.dns_settings = dns_settings self.ip_tags = ip_tags + self.public_ip_prefix = public_ip_prefix diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/__init__.py index 1bfe6fa7e378..8c914b8f17cf 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/__init__.py @@ -35,9 +35,6 @@ from .public_ip_address_sku_py3 import PublicIPAddressSku from .public_ip_address_dns_settings_py3 import PublicIPAddressDnsSettings from .ip_tag_py3 import IpTag - from .public_ip_prefix_sku_py3 import PublicIPPrefixSku - from .referenced_public_ip_address_py3 import ReferencedPublicIpAddress - from .public_ip_prefix_py3 import PublicIPPrefix from .public_ip_address_py3 import PublicIPAddress from .ip_configuration_py3 import IPConfiguration from .resource_navigation_link_py3 import ResourceNavigationLink @@ -184,6 +181,9 @@ from .log_specification_py3 import LogSpecification from .operation_properties_format_service_specification_py3 import OperationPropertiesFormatServiceSpecification from .operation_py3 import Operation + from .public_ip_prefix_sku_py3 import PublicIPPrefixSku + from .referenced_public_ip_address_py3 import ReferencedPublicIpAddress + from .public_ip_prefix_py3 import PublicIPPrefix from .patch_route_filter_rule_py3 import PatchRouteFilterRule from .patch_route_filter_py3 import PatchRouteFilter from .bgp_community_py3 import BGPCommunity @@ -255,9 +255,6 @@ from .public_ip_address_sku import PublicIPAddressSku from .public_ip_address_dns_settings import PublicIPAddressDnsSettings from .ip_tag import IpTag - from .public_ip_prefix_sku import PublicIPPrefixSku - from .referenced_public_ip_address import ReferencedPublicIpAddress - from .public_ip_prefix import PublicIPPrefix from .public_ip_address import PublicIPAddress from .ip_configuration import IPConfiguration from .resource_navigation_link import ResourceNavigationLink @@ -404,6 +401,9 @@ from .log_specification import LogSpecification from .operation_properties_format_service_specification import OperationPropertiesFormatServiceSpecification from .operation import Operation + from .public_ip_prefix_sku import PublicIPPrefixSku + from .referenced_public_ip_address import ReferencedPublicIpAddress + from .public_ip_prefix import PublicIPPrefix from .patch_route_filter_rule import PatchRouteFilterRule from .patch_route_filter import PatchRouteFilter from .bgp_community import BGPCommunity @@ -512,7 +512,6 @@ SecurityRuleDirection, RouteNextHopType, PublicIPAddressSkuName, - PublicIPPrefixSkuName, ApplicationGatewayProtocol, ApplicationGatewayCookieBasedAffinity, ApplicationGatewayBackendHealthServerHealth, @@ -559,6 +558,7 @@ ConnectionMonitorSourceStatus, ConnectionState, EvaluationState, + PublicIPPrefixSkuName, VirtualNetworkPeeringState, VirtualNetworkGatewayType, VpnType, @@ -607,9 +607,6 @@ 'PublicIPAddressSku', 'PublicIPAddressDnsSettings', 'IpTag', - 'PublicIPPrefixSku', - 'ReferencedPublicIpAddress', - 'PublicIPPrefix', 'PublicIPAddress', 'IPConfiguration', 'ResourceNavigationLink', @@ -756,6 +753,9 @@ 'LogSpecification', 'OperationPropertiesFormatServiceSpecification', 'Operation', + 'PublicIPPrefixSku', + 'ReferencedPublicIpAddress', + 'PublicIPPrefix', 'PatchRouteFilterRule', 'PatchRouteFilter', 'BGPCommunity', @@ -863,7 +863,6 @@ 'SecurityRuleDirection', 'RouteNextHopType', 'PublicIPAddressSkuName', - 'PublicIPPrefixSkuName', 'ApplicationGatewayProtocol', 'ApplicationGatewayCookieBasedAffinity', 'ApplicationGatewayBackendHealthServerHealth', @@ -910,6 +909,7 @@ 'ConnectionMonitorSourceStatus', 'ConnectionState', 'EvaluationState', + 'PublicIPPrefixSkuName', 'VirtualNetworkPeeringState', 'VirtualNetworkGatewayType', 'VpnType', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/network_management_client_enums.py b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/network_management_client_enums.py index 2dea047096aa..91c620d605e4 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/network_management_client_enums.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/network_management_client_enums.py @@ -93,11 +93,6 @@ class PublicIPAddressSkuName(str, Enum): standard = "Standard" -class PublicIPPrefixSkuName(str, Enum): - - standard = "Standard" - - class ApplicationGatewayProtocol(str, Enum): http = "Http" @@ -450,6 +445,11 @@ class EvaluationState(str, Enum): completed = "Completed" +class PublicIPPrefixSkuName(str, Enum): + + standard = "Standard" + + class VirtualNetworkPeeringState(str, Enum): initiated = "Initiated" diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address.py b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address.py index 5581eb3e5414..6e89df12d94a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address.py @@ -54,8 +54,7 @@ class PublicIPAddress(Resource): :type ip_address: str :param public_ip_prefix: The Public IP Prefix this Public IP Address should be allocated from. - :type public_ip_prefix: - ~azure.mgmt.network.v2018_07_01.models.PublicIPPrefix + :type public_ip_prefix: ~azure.mgmt.network.v2018_07_01.models.SubResource :param idle_timeout_in_minutes: The idle timeout of the public IP address. :type idle_timeout_in_minutes: int :param resource_guid: The resource GUID property of the public IP @@ -91,7 +90,7 @@ class PublicIPAddress(Resource): 'dns_settings': {'key': 'properties.dnsSettings', 'type': 'PublicIPAddressDnsSettings'}, 'ip_tags': {'key': 'properties.ipTags', 'type': '[IpTag]'}, 'ip_address': {'key': 'properties.ipAddress', 'type': 'str'}, - 'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'PublicIPPrefix'}, + 'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'SubResource'}, 'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'}, 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address_py3.py index 33d3adc327f1..1d36013db0b9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_07_01/models/public_ip_address_py3.py @@ -54,8 +54,7 @@ class PublicIPAddress(Resource): :type ip_address: str :param public_ip_prefix: The Public IP Prefix this Public IP Address should be allocated from. - :type public_ip_prefix: - ~azure.mgmt.network.v2018_07_01.models.PublicIPPrefix + :type public_ip_prefix: ~azure.mgmt.network.v2018_07_01.models.SubResource :param idle_timeout_in_minutes: The idle timeout of the public IP address. :type idle_timeout_in_minutes: int :param resource_guid: The resource GUID property of the public IP @@ -91,7 +90,7 @@ class PublicIPAddress(Resource): 'dns_settings': {'key': 'properties.dnsSettings', 'type': 'PublicIPAddressDnsSettings'}, 'ip_tags': {'key': 'properties.ipTags', 'type': '[IpTag]'}, 'ip_address': {'key': 'properties.ipAddress', 'type': 'str'}, - 'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'PublicIPPrefix'}, + 'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'SubResource'}, 'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'}, 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},