From 9bdf653fd7da1e6ac3955696563b16aaed6aa4ab Mon Sep 17 00:00:00 2001 From: Vineet Mimrot Date: Mon, 21 Nov 2022 21:22:34 +0530 Subject: [PATCH 1/2] Update NSP Link Swagger --- .../examples/NspLinkGet.json | 1 + .../examples/NspLinkList.json | 1 + .../examples/NspLinkPut.json | 2 ++ .../examples/NspLinkReferenceGet.json | 1 + .../examples/NspLinkReferenceList.json | 1 + .../networkSecurityPerimeter.json | 32 +++++++++++++++++-- 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkGet.json index a8c33fbee2a7..cc143bac1112 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkGet.json @@ -17,6 +17,7 @@ "provisioningState": "Succeeded", "autoApprovedRemotePerimeterResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp2", "remotePerimeterGuid": "guid", + "remotePerimeterLocation": "westus2", "localInboundProfiles": [ "*" ], diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkList.json index 16732e5d5c67..43383d338647 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkList.json @@ -18,6 +18,7 @@ "provisioningState": "Succeeded", "autoApprovedRemotePerimeterResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp2", "remotePerimeterGuid": "guid", + "remotePerimeterLocation": "westus2", "localInboundProfiles": [ "*" ], diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkPut.json index 3f533340be96..aff6b13aa0ad 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkPut.json @@ -22,6 +22,7 @@ "provisioningState": "Succeeded", "autoApprovedRemotePerimeterResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp2", "remotePerimeterGuid": "guid", + "remotePerimeterLocation": "westus2", "localInboundProfiles": [ "*" ], @@ -48,6 +49,7 @@ "provisioningState": "Succeeded", "autoApprovedRemotePerimeterResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp2", "remotePerimeterGuid": "guid", + "remotePerimeterLocation": "westus2", "localInboundProfiles": [ "*" ], diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceGet.json index b9a98caac80f..f150110ca1f3 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceGet.json @@ -17,6 +17,7 @@ "provisioningState": "Succeeded", "remotePerimeterResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1", "remotePerimeterGuid": "guid", + "remotePerimeterLocation": "westus2", "localInboundProfiles": [ "*" ], diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceList.json index 8b9e470eb1ec..762c86db5656 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspLinkReferenceList.json @@ -18,6 +18,7 @@ "provisioningState": "Succeeded", "remotePerimeterResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1", "remotePerimeterGuid": "guid", + "remotePerimeterLocation": "westus2", "localInboundProfiles": [ "*" ], diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json index e03af63607c2..40065b96bf9d 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json @@ -1736,6 +1736,24 @@ "modelAsString": true } }, + "NSPLinkProvisioningState": { + "type": "string", + "readOnly": true, + "description": "The current provisioning state of NSP Link/LinkReference.", + "enum": [ + "Succeeded", + "Creating", + "Updating", + "Deleting", + "Accepted", + "Failed", + "WaitForRemoteCompletion" + ], + "x-ms-enum": { + "name": "nspLinkProvisioningState", + "modelAsString": true + } + }, "NspAccessRuleReconcile": { "type": "object", "properties": {}, @@ -1779,7 +1797,7 @@ "properties": { "provisioningState": { "readOnly": true, - "$ref": "#/definitions/NSPProvisioningState", + "$ref": "#/definitions/NSPLinkProvisioningState", "description": "The provisioning state of the NSP Link resource." }, "autoApprovedRemotePerimeterResourceId": { @@ -1795,6 +1813,11 @@ "type": "string", "description": "Remote NSP Guid with which the link gets created." }, + "remotePerimeterLocation": { + "readOnly": true, + "type": "string", + "description": "Remote NSP location with which the link gets created." + }, "localInboundProfiles": { "type": "array", "items": { @@ -1889,7 +1912,7 @@ "properties": { "provisioningState": { "readOnly": true, - "$ref": "#/definitions/NSPProvisioningState", + "$ref": "#/definitions/NSPLinkProvisioningState", "description": "The provisioning state of the NSP LinkReference resource." }, "remotePerimeterResourceId": { @@ -1902,6 +1925,11 @@ "type": "string", "description": "Remote NSP Guid with which the link is created." }, + "remotePerimeterLocation": { + "readOnly": true, + "type": "string", + "description": "Remote NSP location with which the link gets created." + }, "localInboundProfiles": { "type": "array", "items": { From 4f9f6a395c2319f802b67cec1068dbfef5816ead Mon Sep 17 00:00:00 2001 From: Vineet Mimrot Date: Tue, 22 Nov 2022 11:45:34 +0530 Subject: [PATCH 2/2] fix model validation --- .../2021-02-01-preview/examples/NspAccessRuleReconcile.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAccessRuleReconcile.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAccessRuleReconcile.json index 1272d8682429..2f45196b3dc9 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAccessRuleReconcile.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAccessRuleReconcile.json @@ -6,6 +6,7 @@ "resourceGroupName": "rg1", "networkSecurityPerimeterName": "nsp1", "profileName": "profile1", + "accessRuleName": "accessRule1", "parameters": { "properties": {} }