From ec98b0d5b991997762d0bc59b2e7c5d7620b0ddf Mon Sep 17 00:00:00 2001 From: guptas14 <71726901+guptas14@users.noreply.github.com> Date: Fri, 19 Feb 2021 15:58:08 -0800 Subject: [PATCH] fixing NRP networking resource properties (#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 --- custom-words.txt | 2 + .../stable/2020-07-01/networkInterface.json | 23 ++++++++- .../stable/2020-07-01/privateEndpoint.json | 4 ++ .../stable/2020-07-01/publicIpAddress.json | 23 +++++++++ .../stable/2020-07-01/publicIpPrefix.json | 4 ++ .../stable/2020-07-01/serviceTags.json | 5 ++ .../stable/2020-07-01/virtualNetwork.json | 39 ++++++++++++++- .../stable/2020-08-01/networkInterface.json | 36 +++++++++++++ .../stable/2020-08-01/publicIpAddress.json | 27 ++++++++++ .../stable/2020-08-01/publicIpPrefix.json | 4 ++ .../stable/2020-08-01/virtualNetwork.json | 50 ++++++++++++++++++- 11 files changed, 212 insertions(+), 5 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index be1baad598df..ab52c3496330 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2094,3 +2094,5 @@ azureasyncoperations saskey vmsize FSLogix +privatelinkservice +natgateway \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json index e16b18732254..771fa854c5a5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json @@ -1035,6 +1035,10 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "description": "Resource type." } }, "allOf": [ @@ -1153,6 +1157,22 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the network interface resource." + }, + "nicType": { + "type": "string", + "description": "Type of Network Interface resource.", + "enum": [ + "Standard", + "Elastic" + ], + "x-ms-enum": { + "name": "NetworkInterfaceNicType", + "modelAsString": true + } + }, + "privateLinkService": { + "$ref": "./privateLinkService.json#/definitions/PrivateLinkService", + "description": "Privatelinkservice of the network interface resource." } }, "description": "NetworkInterface properties." @@ -1485,7 +1505,8 @@ }, "privateIPAllocationMethod": { "$ref": "./network.json#/definitions/IPAllocationMethod", - "description": "The private IP address allocation method." + "description": "The private IP address allocation method.", + "default": "Dynamic" }, "subnet": { "$ref": "./virtualNetwork.json#/definitions/Subnet", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/privateEndpoint.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/privateEndpoint.json index 5d748c145bfa..f7ea1596b001 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/privateEndpoint.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/privateEndpoint.json @@ -850,6 +850,10 @@ "resourceName": { "type": "string", "description": "The name of the service and resource." + }, + "displayName": { + "type": "string", + "description": "Display name of the resource." } }, "description": "The information of an AvailablePrivateEndpointType." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json index 032b26c7649c..d90aa6dccfe7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json @@ -444,6 +444,29 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the public IP address resource." + }, + "natGateway": { + "$ref": "./natGateway.json#/definitions/NatGateway", + "description": "The NatGateway for the Public IP address." + }, + "migrationPhase": { + "type": "string", + "description": "Migration phase of Public IP Address.", + "enum": [ + "None", + "Prepare", + "Commit", + "Abort", + "Committed" + ], + "x-ms-enum": { + "name": "PublicIPAddressMigrationPhase", + "modelAsString": true + } + }, + "linkedPublicIPAddress": { + "$ref": "#/definitions/PublicIPAddress", + "description": "The linked public IP address of the public IP address resource." } }, "description": "Public IP address properties." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json index fd04cfb3a839..241ac40d013a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json @@ -437,6 +437,10 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the public IP prefix resource." + }, + "natGateway": { + "$ref": "./natGateway.json#/definitions/NatGateway", + "description": "NatGateway of Public IP Prefix." } }, "description": "Public IP prefix properties." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/serviceTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/serviceTags.json index 06abc2a9f12e..fb5d6d6795bb 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/serviceTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/serviceTags.json @@ -163,6 +163,11 @@ }, "readOnly": true, "description": "The list of IP address prefixes." + }, + "state": { + "type": "string", + "readOnly": true, + "description": "The state of the service tag." } }, "description": "Properties of the service tag information." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json index 1be938b579ad..7c37dd57a50e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json @@ -1496,11 +1496,29 @@ }, "privateEndpointNetworkPolicies": { "type": "string", - "description": "Enable or Disable apply network policies on private end point in the subnet." + "default": "Enabled", + "description": "Enable or Disable apply network policies on private end point in the subnet.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "VirtualNetworkPrivateEndpointNetworkPolicies", + "modelAsString": true + } }, "privateLinkServiceNetworkPolicies": { "type": "string", - "description": "Enable or Disable apply network policies on private link service in the subnet." + "default": "Enabled", + "description": "Enable or Disable apply network policies on private link service in the subnet.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "VirtualNetworkPrivateLinkServiceNetworkPolicies", + "modelAsString": true + } } }, "description": "Properties of the subnet." @@ -1574,6 +1592,11 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the virtual network peering resource." + }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the Virtual Network peering resource." } }, "description": "Properties of the virtual network peering." @@ -1593,6 +1616,10 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "description": "Resource type." } }, "allOf": [ @@ -1617,6 +1644,10 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "description": "Resource type." } }, "allOf": [ @@ -1849,6 +1880,10 @@ "type": "string" }, "description": "Contains other available private IP addresses if the asked for address is taken." + }, + "isPlatformReserved": { + "type": "boolean", + "description": "Private IP address platform reserved." } }, "description": "Response for CheckIPAddressAvailability API service call." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json index 772d00e21261..95c6966ac9c8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json @@ -1035,6 +1035,10 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "description": "Resource type." } }, "allOf": [ @@ -1153,6 +1157,38 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the network interface resource." + }, + "nicType": { + "type": "string", + "default": "Standard", + "description": "Type of Network Interface resource.", + "enum": [ + "Standard", + "Elastic" + ], + "x-ms-enum": { + "name": "NetworkInterfaceNicType", + "modelAsString": true + } + }, + "privateLinkService": { + "$ref": "./privateLinkService.json#/definitions/PrivateLinkService", + "description": "Privatelinkservice of the network interface resource." + }, + "migrationPhase": { + "type": "string", + "description": "Migration phase of Network Interface resource.", + "enum": [ + "None", + "Prepare", + "Commit", + "Abort", + "Committed" + ], + "x-ms-enum": { + "name": "NetworkInterfaceMigrationPhase", + "modelAsString": true + } } }, "description": "NetworkInterface properties." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json index 57805367524b..e263af0bfb02 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json @@ -444,6 +444,33 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the public IP address resource." + }, + "servicePublicIPAddress": { + "$ref": "#/definitions/PublicIPAddress", + "description": "The service public IP address of the public IP address resource." + }, + "natGateway": { + "$ref": "./natGateway.json#/definitions/NatGateway", + "description": "The NatGateway for the Public IP address." + }, + "migrationPhase": { + "type": "string", + "description": "Migration phase of Public IP Address.", + "enum": [ + "None", + "Prepare", + "Commit", + "Abort", + "Committed" + ], + "x-ms-enum": { + "name": "PublicIpAddressMigrationPhase", + "modelAsString": true + } + }, + "linkedPublicIPAddress": { + "$ref": "#/definitions/PublicIPAddress", + "description": "The source Public IP Address (IPv6) that links to this address (IPv4)." } }, "description": "Public IP address properties." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json index a0733159988a..75545a306aab 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json @@ -437,6 +437,10 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the public IP prefix resource." + }, + "natGateway": { + "$ref": "./natGateway.json#/definitions/NatGateway", + "description": "NatGateway of Public IP Prefix." } }, "description": "Public IP prefix properties." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json index 6de777eed539..d474b1da5a77 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json @@ -1382,6 +1382,10 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "description": "Resource type." } }, "allOf": [ @@ -1496,11 +1500,36 @@ }, "privateEndpointNetworkPolicies": { "type": "string", - "description": "Enable or Disable apply network policies on private end point in the subnet." + "default": "Enabled", + "description": "Enable or Disable apply network policies on private end point in the subnet.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "VirtualNetworkPrivateEndpointNetworkPolicies", + "modelAsString": true + } }, "privateLinkServiceNetworkPolicies": { "type": "string", - "description": "Enable or Disable apply network policies on private link service in the subnet." + "default": "Enabled", + "description": "Enable or Disable apply network policies on private link service in the subnet.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "VirtualNetworkPrivateLinkServiceNetworkPolicies", + "modelAsString": true + } + }, + "applicationGatewayIpConfigurations": { + "type": "array", + "items": { + "$ref": "./applicationGateway.json#/definitions/ApplicationGatewayIPConfiguration" + }, + "description": "Application gateway IP configurations of virtual network resource." } }, "description": "Properties of the subnet." @@ -1574,6 +1603,15 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the virtual network peering resource." + }, + "doNotVerifyRemoteGateways": { + "type": "boolean", + "description": "If we need to verify the provisioning state of the remote gateway." + }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the Virtual Network Peering resource." } }, "description": "Properties of the virtual network peering." @@ -1593,6 +1631,10 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "description": "Resource type." } }, "allOf": [ @@ -1617,6 +1659,10 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "description": "Resource type." } }, "allOf": [