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.

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

[AutoPR network/resource-manager/compute/resource-manager] Publicipprefixaugust #3122

Merged
merged 1 commit into from
Aug 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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.<br
/><br /> Possible Values:<br /><br /> **Standard**<br /><br /> **Basic**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.<br
/><br /> Possible Values:<br /><br /> **Standard**<br /><br /> **Basic**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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):
Expand All @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -512,7 +512,6 @@
SecurityRuleDirection,
RouteNextHopType,
PublicIPAddressSkuName,
PublicIPPrefixSkuName,
ApplicationGatewayProtocol,
ApplicationGatewayCookieBasedAffinity,
ApplicationGatewayBackendHealthServerHealth,
Expand Down Expand Up @@ -559,6 +558,7 @@
ConnectionMonitorSourceStatus,
ConnectionState,
EvaluationState,
PublicIPPrefixSkuName,
VirtualNetworkPeeringState,
VirtualNetworkGatewayType,
VpnType,
Expand Down Expand Up @@ -607,9 +607,6 @@
'PublicIPAddressSku',
'PublicIPAddressDnsSettings',
'IpTag',
'PublicIPPrefixSku',
'ReferencedPublicIpAddress',
'PublicIPPrefix',
'PublicIPAddress',
'IPConfiguration',
'ResourceNavigationLink',
Expand Down Expand Up @@ -756,6 +753,9 @@
'LogSpecification',
'OperationPropertiesFormatServiceSpecification',
'Operation',
'PublicIPPrefixSku',
'ReferencedPublicIpAddress',
'PublicIPPrefix',
'PatchRouteFilterRule',
'PatchRouteFilter',
'BGPCommunity',
Expand Down Expand Up @@ -863,7 +863,6 @@
'SecurityRuleDirection',
'RouteNextHopType',
'PublicIPAddressSkuName',
'PublicIPPrefixSkuName',
'ApplicationGatewayProtocol',
'ApplicationGatewayCookieBasedAffinity',
'ApplicationGatewayBackendHealthServerHealth',
Expand Down Expand Up @@ -910,6 +909,7 @@
'ConnectionMonitorSourceStatus',
'ConnectionState',
'EvaluationState',
'PublicIPPrefixSkuName',
'VirtualNetworkPeeringState',
'VirtualNetworkGatewayType',
'VpnType',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ class PublicIPAddressSkuName(str, Enum):
standard = "Standard"


class PublicIPPrefixSkuName(str, Enum):

standard = "Standard"


class ApplicationGatewayProtocol(str, Enum):

http = "Http"
Expand Down Expand Up @@ -450,6 +445,11 @@ class EvaluationState(str, Enum):
completed = "Completed"


class PublicIPPrefixSkuName(str, Enum):

standard = "Standard"


class VirtualNetworkPeeringState(str, Enum):

initiated = "Initiated"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'},
Expand Down