fix nrp resources based on s360 checks (#14219)

Azure · May 7, 2021 · 45a3599 · 45a3599
1 parent a42d44d
commit 45a3599
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 1 deletion.
diff --git a/...cation/network/resource-manager/Microsoft.Network/stable/2021-02-01/networkInterface.json b/...cation/network/resource-manager/Microsoft.Network/stable/2021-02-01/networkInterface.json
@@ -1042,6 +1042,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": [
@@ -1164,6 +1168,37 @@
         "workloadType": {
           "type": "string",
           "description": "WorkloadType of the NetworkInterface for BareMetal resources"
+        },
+        "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."
+        },
+        "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."
@@ -1496,7 +1531,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/2021-02-01/privateEndpoint.json b/...ication/network/resource-manager/Microsoft.Network/stable/2021-02-01/privateEndpoint.json
@@ -854,6 +854,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/2021-02-01/publicIpAddress.json b/...ication/network/resource-manager/Microsoft.Network/stable/2021-02-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 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/2021-02-01/publicIpPrefix.json b/...fication/network/resource-manager/Microsoft.Network/stable/2021-02-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/2021-02-01/serviceTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-02-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/2021-02-01/virtualNetwork.json b/...fication/network/resource-manager/Microsoft.Network/stable/2021-02-01/virtualNetwork.json
@@ -1399,6 +1399,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": [
@@ -1536,6 +1540,13 @@
             "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."
@@ -1627,6 +1638,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."
@@ -1646,6 +1666,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": [
@@ -1670,6 +1694,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": [
@@ -1907,6 +1935,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."