From f2775530ec1edf1d457e9da3158c30dfd3fabf19 Mon Sep 17 00:00:00 2001 From: Bhupesh Bhatt Date: Fri, 31 May 2024 17:14:19 +0530 Subject: [PATCH 1/6] added networkidentifier under vnet->subet->serviceendpoint --- ...reateServiceEndpointNetworkIdentifier.json | 64 +++++++++++++++++++ .../stable/2024-01-01/virtualNetwork.json | 7 ++ 2 files changed, 71 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json new file mode 100644 index 000000000000..8f89c5511ba1 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json @@ -0,0 +1,64 @@ +{ + "parameters": { + "subnetName": "subnet1", + "virtualNetworkName": "vnetname", + "resourceGroupName": "subnet-test", + "api-version": "2024-01-01", + "subscriptionId": "subid", + "subnetParameters": { + "properties": { + "addressPrefix": "10.0.0.0/16", + "serviceEndpoints": [ + { + "service": "Microsoft.Storage", + "networkIdentifier": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip" + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/subnet1", + "name": "subnet1", + "properties": { + "addressPrefix": "10.0.0.0/16", + "serviceEndpoints": [ + { + "service": "Microsoft.Storage", + "networkIdentifier": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip", + "locations": [ + "eastus2(stage)", + "usnorth(stage)" + ], + "provisioningState": "Succeeded" + } + ], + "provisioningState": "Succeeded" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/subnet1", + "name": "subnet1", + "properties": { + "addressPrefix": "10.0.0.0/16", + "serviceEndpoints": [ + { + "service": "Microsoft.Storage", + "networkIdentifier": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip", + "locations": [ + "eastus2(stage)", + "usnorth(stage)" + ], + "provisioningState": "Succeeded" + } + ], + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json index 3fc87258c0bb..f70467395806 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json @@ -593,6 +593,9 @@ }, "Create subnet with sharing scope": { "$ref": "./examples/SubnetCreateWithSharingScope.json" + }, + "Create subnet with service endpoints with network identifier": { + "$ref": "./examples/SubnetCreateServiceEndpointNetworkIdentifier.json" } } } @@ -1684,6 +1687,10 @@ "type": "string", "description": "The type of the endpoint service." }, + "networkIdentifier": { + "type": "string", + "description": "A public IP as network identification." + }, "locations": { "type": "array", "items": { From db59ae93fde0743230d8c859e47145de95420fb8 Mon Sep 17 00:00:00 2001 From: Bhupesh Bhatt Date: Thu, 6 Jun 2024 22:23:48 +0530 Subject: [PATCH 2/6] added format :armid and updated description --- .../Microsoft.Network/stable/2024-01-01/virtualNetwork.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json index f70467395806..f86a09deace5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json @@ -1689,7 +1689,8 @@ }, "networkIdentifier": { "type": "string", - "description": "A public IP as network identification." + "description": "Arm Id of public IP as network identification.", + "format": "arm-id" }, "locations": { "type": "array", From c387ab1b89547d5506acf42123526bc79e1b8623 Mon Sep 17 00:00:00 2001 From: Bhupesh Bhatt Date: Thu, 6 Jun 2024 23:27:41 +0530 Subject: [PATCH 3/6] corrected the type --- .../SubnetCreateServiceEndpointNetworkIdentifier.json | 4 +++- .../Microsoft.Network/stable/2024-01-01/virtualNetwork.json | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json index 8f89c5511ba1..ec5097063695 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json @@ -11,7 +11,9 @@ "serviceEndpoints": [ { "service": "Microsoft.Storage", - "networkIdentifier": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip" + "networkIdentifier": { + "id": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip" + } } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json index f86a09deace5..500a68ca0ea6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json @@ -1688,9 +1688,8 @@ "description": "The type of the endpoint service." }, "networkIdentifier": { - "type": "string", - "description": "Arm Id of public IP as network identification.", - "format": "arm-id" + "$ref": "./publicIpAddress.json#/definitions/PublicIPAddress", + "description": "public IP Adress Resource as network identification." }, "locations": { "type": "array", From 4d45252e2416f5df131e12d45661b7fb77088422 Mon Sep 17 00:00:00 2001 From: Bhupesh Bhatt Date: Thu, 6 Jun 2024 23:34:11 +0530 Subject: [PATCH 4/6] fixed response --- .../SubnetCreateServiceEndpointNetworkIdentifier.json | 4 +++- .../Microsoft.Network/stable/2024-01-01/virtualNetwork.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json index ec5097063695..4adf21ab8c28 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json @@ -50,7 +50,9 @@ "serviceEndpoints": [ { "service": "Microsoft.Storage", - "networkIdentifier": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip", + "networkIdentifier": { + "id": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip" + }, "locations": [ "eastus2(stage)", "usnorth(stage)" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json index 500a68ca0ea6..3be469b82625 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json @@ -1689,7 +1689,7 @@ }, "networkIdentifier": { "$ref": "./publicIpAddress.json#/definitions/PublicIPAddress", - "description": "public IP Adress Resource as network identification." + "description": "Public IP Address Resource as network identifier." }, "locations": { "type": "array", From 1bb54e9c18f0bb7ca72f9fb72e45d58da2257642 Mon Sep 17 00:00:00 2001 From: Bhupesh Bhatt Date: Thu, 6 Jun 2024 23:36:55 +0530 Subject: [PATCH 5/6] response type fixed example --- .../SubnetCreateServiceEndpointNetworkIdentifier.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json index 4adf21ab8c28..b6b0183ce494 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/examples/SubnetCreateServiceEndpointNetworkIdentifier.json @@ -29,7 +29,9 @@ "serviceEndpoints": [ { "service": "Microsoft.Storage", - "networkIdentifier": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip", + "networkIdentifier": { + "id": "/subscriptions/subid/resourceGroups/subnet-test/providers/Microsoft.Network/publicIPAddresses/test-ip" + }, "locations": [ "eastus2(stage)", "usnorth(stage)" From c9666b4751746c77dbc9fb7952b6908aad00e613 Mon Sep 17 00:00:00 2001 From: Bhupesh Bhatt Date: Mon, 17 Jun 2024 23:55:30 +0530 Subject: [PATCH 6/6] Changed type of networkIdentifier from ./publicIpAddress.json#/definitions/PublicIPAddress to ./network.json#/definitions/SubResource --- .../Microsoft.Network/stable/2024-01-01/virtualNetwork.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json index 3be469b82625..20ce59d44352 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2024-01-01/virtualNetwork.json @@ -1688,8 +1688,8 @@ "description": "The type of the endpoint service." }, "networkIdentifier": { - "$ref": "./publicIpAddress.json#/definitions/PublicIPAddress", - "description": "Public IP Address Resource as network identifier." + "$ref": "./network.json#/definitions/SubResource", + "description": "SubResource as network identifier." }, "locations": { "type": "array",