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
Azure · Feb 19, 2021 · ec98b0d · ec98b0d
1 parent 2083db7
commit ec98b0d
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 5 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -2094,3 +2094,5 @@ azureasyncoperations
 saskey
 vmsize
 FSLogix
+privatelinkservice
+natgateway
diff --git a/...cation/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json b/...cation/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/...ication/network/resource-manager/Microsoft.Network/stable/2020-07-01/privateEndpoint.json b/...ication/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/...ication/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json b/...ication/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/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json b/...fication/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
@@ -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/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json b/...fication/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/...cation/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json b/...cation/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/...ication/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json b/...ication/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/...fication/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json b/...fication/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/...fication/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json b/...fication/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": [