Generated from 37a0eec749bebaea3384a6abfedd6c54e02b9ecc

Publicipprefixaugust (#3618) * Add PublicIpPrefix * Add PublicIpPrefix * Add PublicIpPrefix * Move to 2018-07-01 branch * revertversionchange * Fix Syntax error * Fix IpTag description because evidently everything is global * Fix $ref for PublicIpPrefix * Fix Casing * Add Exception for PublicIPPrefix from RequiredPropertiesMissingInResourceModel * Fix Version# * Fix Examples * Remove IdleTimeout parameter * Fix comma * Add PublicIpPrefix for PublicIpAddressConfiguration * Fix PublicIPAddress to refer to PublicIpPrefix as SubResource * Fix Comma * Remove compute update
Azure · Aug 10, 2018 · 21122a2 · 21122a2
1 parent 372e5fa
commit 21122a2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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'},