CodeGen from PR 12570 in Azure/azure-rest-api-specs

fixing NRP networking resource properties (Azure#12570)

* fixing NRP networking resource properties

* fixing natgateway and privatelinkservice references

* adding custom word privatelinkservice

* virtualnetwork prettier fix

* added custom word natgateway

* added more missing resource properties as per S360

* correct natgateway reference

* revert 'Error' property casing

* fix linkedpublicipaddress property

* adding enum values

* added prefixes and prettier check done

* added prefix for 2 properties

Author: SDKAuto

sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_07_01/models/__init__.py

@@ -1200,6 +1200,7 @@
     LoadDistribution,
     ManagedRuleEnabledState,
     NatGatewaySkuName,
+    NetworkInterfaceNicType,
     NetworkOperationStatus,
     NextHopType,
     OfficeTrafficCategory,
@@ -1217,6 +1218,7 @@
     Protocol,
     ProtocolType,
     ProvisioningState,
+    PublicIPAddressMigrationPhase,
     PublicIPAddressSkuName,
     PublicIPAddressSkuTier,
     PublicIPPrefixSkuName,
@@ -1244,6 +1246,8 @@
     VirtualNetworkGatewaySkuTier,
     VirtualNetworkGatewayType,
     VirtualNetworkPeeringState,
+    VirtualNetworkPrivateEndpointNetworkPolicies,
+    VirtualNetworkPrivateLinkServiceNetworkPolicies,
     VirtualWanSecurityProviderType,
     VpnAuthenticationType,
     VpnClientProtocol,
@@ -1902,6 +1906,7 @@
     'LoadDistribution',
     'ManagedRuleEnabledState',
     'NatGatewaySkuName',
+    'NetworkInterfaceNicType',
     'NetworkOperationStatus',
     'NextHopType',
     'OfficeTrafficCategory',
@@ -1919,6 +1924,7 @@
     'Protocol',
     'ProtocolType',
     'ProvisioningState',
+    'PublicIPAddressMigrationPhase',
     'PublicIPAddressSkuName',
     'PublicIPAddressSkuTier',
     'PublicIPPrefixSkuName',
@@ -1946,6 +1952,8 @@
     'VirtualNetworkGatewaySkuTier',
     'VirtualNetworkGatewayType',
     'VirtualNetworkPeeringState',
+    'VirtualNetworkPrivateEndpointNetworkPolicies',
+    'VirtualNetworkPrivateLinkServiceNetworkPolicies',
     'VirtualWanSecurityProviderType',
     'VpnAuthenticationType',
     'VpnClientProtocol',

sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_07_01/models/_models.py

@@ -3038,13 +3038,16 @@ class AvailablePrivateEndpointType(msrest.serialization.Model):
     :type type: str
     :param resource_name: The name of the service and resource.
     :type resource_name: str
+    :param display_name: Display name of the resource.
+    :type display_name: str
     """
 
     _attribute_map = {
         'name': {'key': 'name', 'type': 'str'},
         'id': {'key': 'id', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'resource_name': {'key': 'resourceName', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
     }
 
     def __init__(
@@ -3056,6 +3059,7 @@ def __init__(
         self.id = kwargs.get('id', None)
         self.type = kwargs.get('type', None)
         self.resource_name = kwargs.get('resource_name', None)
+        self.display_name = kwargs.get('display_name', None)
 
 
 class AvailablePrivateEndpointTypesResult(msrest.serialization.Model):
@@ -11097,11 +11101,14 @@ class IPAddressAvailabilityResult(msrest.serialization.Model):
     :param available_ip_addresses: Contains other available private IP addresses if the asked for
      address is taken.
     :type available_ip_addresses: list[str]
+    :param is_platform_reserved: Private IP address platform reserved.
+    :type is_platform_reserved: bool
     """
 
     _attribute_map = {
         'available': {'key': 'available', 'type': 'bool'},
         'available_ip_addresses': {'key': 'availableIPAddresses', 'type': '[str]'},
+        'is_platform_reserved': {'key': 'isPlatformReserved', 'type': 'bool'},
     }
 
     def __init__(
@@ -11111,6 +11118,7 @@ def __init__(
         super(IPAddressAvailabilityResult, self).__init__(**kwargs)
         self.available = kwargs.get('available', None)
         self.available_ip_addresses = kwargs.get('available_ip_addresses', None)
+        self.is_platform_reserved = kwargs.get('is_platform_reserved', None)
 
 
 class IpAllocation(Resource):
@@ -13284,6 +13292,11 @@ class NetworkInterface(Resource):
     :ivar provisioning_state: The provisioning state of the network interface resource. Possible
      values include: "Succeeded", "Updating", "Deleting", "Failed".
     :vartype provisioning_state: str or ~azure.mgmt.network.v2020_07_01.models.ProvisioningState
+    :param nic_type: Type of Network Interface resource. Possible values include: "Standard",
+     "Elastic".
+    :type nic_type: str or ~azure.mgmt.network.v2020_07_01.models.NetworkInterfaceNicType
+    :param private_link_service: Privatelinkservice of the network interface resource.
+    :type private_link_service: ~azure.mgmt.network.v2020_07_01.models.PrivateLinkService
     """
 
     _validation = {
@@ -13323,6 +13336,8 @@ class NetworkInterface(Resource):
         'dscp_configuration': {'key': 'properties.dscpConfiguration', 'type': 'SubResource'},
         'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'nic_type': {'key': 'properties.nicType', 'type': 'str'},
+        'private_link_service': {'key': 'properties.privateLinkService', 'type': 'PrivateLinkService'},
     }
 
     def __init__(
@@ -13346,6 +13361,8 @@ def __init__(
         self.dscp_configuration = None
         self.resource_guid = None
         self.provisioning_state = None
+        self.nic_type = kwargs.get('nic_type', None)
+        self.private_link_service = kwargs.get('private_link_service', None)
 
 
 class NetworkInterfaceAssociation(msrest.serialization.Model):
@@ -13440,6 +13457,8 @@ class NetworkInterfaceIPConfiguration(SubResource):
     :type name: str
     :ivar etag: A unique read-only string that changes whenever the resource is updated.
     :vartype etag: str
+    :param type: Resource type.
+    :type type: str
     :param virtual_network_taps: The reference to Virtual Network Taps.
     :type virtual_network_taps: list[~azure.mgmt.network.v2020_07_01.models.VirtualNetworkTap]
     :param application_gateway_backend_address_pools: The reference to
@@ -13491,6 +13510,7 @@ class NetworkInterfaceIPConfiguration(SubResource):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'virtual_network_taps': {'key': 'properties.virtualNetworkTaps', 'type': '[VirtualNetworkTap]'},
         'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[ApplicationGatewayBackendAddressPool]'},
         'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[BackendAddressPool]'},
@@ -13513,6 +13533,7 @@ def __init__(
         super(NetworkInterfaceIPConfiguration, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.etag = None
+        self.type = kwargs.get('type', None)
         self.virtual_network_taps = kwargs.get('virtual_network_taps', None)
         self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
         self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
@@ -16520,6 +16541,15 @@ class PublicIPAddress(Resource):
     :ivar provisioning_state: The provisioning state of the public IP address resource. Possible
      values include: "Succeeded", "Updating", "Deleting", "Failed".
     :vartype provisioning_state: str or ~azure.mgmt.network.v2020_07_01.models.ProvisioningState
+    :param nat_gateway: The NatGateway for the Public IP address.
+    :type nat_gateway: ~azure.mgmt.network.v2020_07_01.models.NatGateway
+    :param migration_phase: Migration phase of Public IP Address. Possible values include: "None",
+     "Prepare", "Commit", "Abort", "Committed".
+    :type migration_phase: str or
+     ~azure.mgmt.network.v2020_07_01.models.PublicIPAddressMigrationPhase
+    :param linked_public_ip_address: The linked public IP address of the public IP address
+     resource.
+    :type linked_public_ip_address: ~azure.mgmt.network.v2020_07_01.models.PublicIPAddress
     """
 
     _validation = {
@@ -16552,6 +16582,9 @@ class PublicIPAddress(Resource):
         'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
         'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'nat_gateway': {'key': 'properties.natGateway', 'type': 'NatGateway'},
+        'migration_phase': {'key': 'properties.migrationPhase', 'type': 'str'},
+        'linked_public_ip_address': {'key': 'properties.linkedPublicIPAddress', 'type': 'PublicIPAddress'},
     }
 
     def __init__(
@@ -16574,6 +16607,9 @@ def __init__(
         self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
         self.resource_guid = None
         self.provisioning_state = None
+        self.nat_gateway = kwargs.get('nat_gateway', None)
+        self.migration_phase = kwargs.get('migration_phase', None)
+        self.linked_public_ip_address = kwargs.get('linked_public_ip_address', None)
 
 
 class PublicIPAddressDnsSettings(msrest.serialization.Model):
@@ -16702,6 +16738,8 @@ class PublicIPPrefix(Resource):
     :ivar provisioning_state: The provisioning state of the public IP prefix resource. Possible
      values include: "Succeeded", "Updating", "Deleting", "Failed".
     :vartype provisioning_state: str or ~azure.mgmt.network.v2020_07_01.models.ProvisioningState
+    :param nat_gateway: NatGateway of Public IP Prefix.
+    :type nat_gateway: ~azure.mgmt.network.v2020_07_01.models.NatGateway
     """
 
     _validation = {
@@ -16734,6 +16772,7 @@ class PublicIPPrefix(Resource):
         'custom_ip_prefix': {'key': 'properties.customIPPrefix', 'type': 'SubResource'},
         'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'nat_gateway': {'key': 'properties.natGateway', 'type': 'NatGateway'},
     }
 
     def __init__(
@@ -16754,6 +16793,7 @@ def __init__(
         self.custom_ip_prefix = kwargs.get('custom_ip_prefix', None)
         self.resource_guid = None
         self.provisioning_state = None
+        self.nat_gateway = kwargs.get('nat_gateway', None)
 
 
 class PublicIPPrefixListResult(msrest.serialization.Model):
@@ -18097,20 +18137,24 @@ class ServiceTagInformationPropertiesFormat(msrest.serialization.Model):
     :vartype system_service: str
     :ivar address_prefixes: The list of IP address prefixes.
     :vartype address_prefixes: list[str]
+    :ivar state: The state of the service tag.
+    :vartype state: str
     """
 
     _validation = {
         'change_number': {'readonly': True},
         'region': {'readonly': True},
         'system_service': {'readonly': True},
         'address_prefixes': {'readonly': True},
+        'state': {'readonly': True},
     }
 
     _attribute_map = {
         'change_number': {'key': 'changeNumber', 'type': 'str'},
         'region': {'key': 'region', 'type': 'str'},
         'system_service': {'key': 'systemService', 'type': 'str'},
         'address_prefixes': {'key': 'addressPrefixes', 'type': '[str]'},
+        'state': {'key': 'state', 'type': 'str'},
     }
 
     def __init__(
@@ -18122,6 +18166,7 @@ def __init__(
         self.region = None
         self.system_service = None
         self.address_prefixes = None
+        self.state = None
 
 
 class ServiceTagsListResult(msrest.serialization.Model):
@@ -18237,6 +18282,8 @@ class Subnet(SubResource):
     :type name: str
     :ivar etag: A unique read-only string that changes whenever the resource is updated.
     :vartype etag: str
+    :param type: Resource type.
+    :type type: str
     :param address_prefix: The address prefix for the subnet.
     :type address_prefix: str
     :param address_prefixes: List of address prefixes for the subnet.
@@ -18279,11 +18326,15 @@ class Subnet(SubResource):
      include: "Succeeded", "Updating", "Deleting", "Failed".
     :vartype provisioning_state: str or ~azure.mgmt.network.v2020_07_01.models.ProvisioningState
     :param private_endpoint_network_policies: Enable or Disable apply network policies on private
-     end point in the subnet.
-    :type private_endpoint_network_policies: str
+     end point in the subnet. Possible values include: "Enabled", "Disabled". Default value:
+     "Enabled".
+    :type private_endpoint_network_policies: str or
+     ~azure.mgmt.network.v2020_07_01.models.VirtualNetworkPrivateEndpointNetworkPolicies
     :param private_link_service_network_policies: Enable or Disable apply network policies on
-     private link service in the subnet.
-    :type private_link_service_network_policies: str
+     private link service in the subnet. Possible values include: "Enabled", "Disabled". Default
+     value: "Enabled".
+    :type private_link_service_network_policies: str or
+     ~azure.mgmt.network.v2020_07_01.models.VirtualNetworkPrivateLinkServiceNetworkPolicies
     """
 
     _validation = {
@@ -18301,6 +18352,7 @@ class Subnet(SubResource):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'address_prefix': {'key': 'properties.addressPrefix', 'type': 'str'},
         'address_prefixes': {'key': 'properties.addressPrefixes', 'type': '[str]'},
         'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'NetworkSecurityGroup'},
@@ -18328,6 +18380,7 @@ def __init__(
         super(Subnet, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.etag = None
+        self.type = kwargs.get('type', None)
         self.address_prefix = kwargs.get('address_prefix', None)
         self.address_prefixes = kwargs.get('address_prefixes', None)
         self.network_security_group = kwargs.get('network_security_group', None)
@@ -18344,8 +18397,8 @@ def __init__(
         self.delegations = kwargs.get('delegations', None)
         self.purpose = None
         self.provisioning_state = None
-        self.private_endpoint_network_policies = kwargs.get('private_endpoint_network_policies', None)
-        self.private_link_service_network_policies = kwargs.get('private_link_service_network_policies', None)
+        self.private_endpoint_network_policies = kwargs.get('private_endpoint_network_policies', "Enabled")
+        self.private_link_service_network_policies = kwargs.get('private_link_service_network_policies', "Enabled")
 
 
 class SubnetAssociation(msrest.serialization.Model):
@@ -20299,6 +20352,8 @@ class VirtualNetworkPeering(SubResource):
     :type name: str
     :ivar etag: A unique read-only string that changes whenever the resource is updated.
     :vartype etag: str
+    :param type: Resource type.
+    :type type: str
     :param allow_virtual_network_access: Whether the VMs in the local virtual network space would
      be able to access the VMs in remote virtual network space.
     :type allow_virtual_network_access: bool
@@ -20329,17 +20384,21 @@ class VirtualNetworkPeering(SubResource):
     :ivar provisioning_state: The provisioning state of the virtual network peering resource.
      Possible values include: "Succeeded", "Updating", "Deleting", "Failed".
     :vartype provisioning_state: str or ~azure.mgmt.network.v2020_07_01.models.ProvisioningState
+    :ivar resource_guid: The resourceGuid property of the Virtual Network peering resource.
+    :vartype resource_guid: str
     """
 
     _validation = {
         'etag': {'readonly': True},
         'provisioning_state': {'readonly': True},
+        'resource_guid': {'readonly': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'allow_virtual_network_access': {'key': 'properties.allowVirtualNetworkAccess', 'type': 'bool'},
         'allow_forwarded_traffic': {'key': 'properties.allowForwardedTraffic', 'type': 'bool'},
         'allow_gateway_transit': {'key': 'properties.allowGatewayTransit', 'type': 'bool'},
@@ -20349,6 +20408,7 @@ class VirtualNetworkPeering(SubResource):
         'remote_bgp_communities': {'key': 'properties.remoteBgpCommunities', 'type': 'VirtualNetworkBgpCommunities'},
         'peering_state': {'key': 'properties.peeringState', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'},
     }
 
     def __init__(
@@ -20358,6 +20418,7 @@ def __init__(
         super(VirtualNetworkPeering, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.etag = None
+        self.type = kwargs.get('type', None)
         self.allow_virtual_network_access = kwargs.get('allow_virtual_network_access', None)
         self.allow_forwarded_traffic = kwargs.get('allow_forwarded_traffic', None)
         self.allow_gateway_transit = kwargs.get('allow_gateway_transit', None)
@@ -20367,6 +20428,7 @@ def __init__(
         self.remote_bgp_communities = kwargs.get('remote_bgp_communities', None)
         self.peering_state = kwargs.get('peering_state', None)
         self.provisioning_state = None
+        self.resource_guid = None
 
 
 class VirtualNetworkPeeringListResult(msrest.serialization.Model):