diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NSPCheckMembersPost.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NSPCheckMembersPost.json deleted file mode 100644 index e8dd25d906c5..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NSPCheckMembersPost.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "title": "Post Network Security Perimeter Check Members", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkSecurityPerimeterName": "nsp1", - "networkSecurityPerimeterProfile": "NP1", - "parameters": { - "memberDestinations": [ - { - "privateLinkResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Sql/servers/resourceName1" - } - ] - } - }, - "responses": { - "200": { - "body": { - "memberDestinations": [ - { - "privateLinkResourceId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Sql/servers/resourceName1", - "isMember": "no", - "profile": "" - } - ] - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationProxyDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationReconcile.json similarity index 65% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationProxyDelete.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationReconcile.json index 93f4c5cfce03..9dc80cfbe7fe 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationProxyDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationReconcile.json @@ -1,15 +1,18 @@ { - "title": "Delete NSP resource association", + "title": "Reconcile NSP association", "parameters": { "api-version": "2021-02-01-preview", "subscriptionId": "subId", "resourceGroupName": "rg1", "networkSecurityPerimeterName": "nsp1", "associationName": "association1", - "operationId": "operationId1" + "parameters": { + "properties": {} + } }, "responses": { - "200": {}, - "204": {} + "200": { + "body": {} + } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileGet.json index a9cd5d203a92..ce38774c590c 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileGet.json @@ -15,7 +15,8 @@ "type": "Microsoft.Network/networkSecurityPerimeters/profiles", "location": "resource location", "properties": { - "accessRulesVersion": "0" + "accessRulesVersion": "0", + "diagnosticSettingsVersion": "0" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileList.json index cd0492637aa1..931ad7eb3002 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileList.json @@ -16,7 +16,8 @@ "type": "Microsoft.Network/networkSecurityPerimeters/profiles", "location": "resource location", "properties": { - "accessRulesVersion": "0" + "accessRulesVersion": "0", + "diagnosticSettingsVersion": "0" } }, { @@ -25,7 +26,8 @@ "type": "Microsoft.Network/networkSecurityPerimeters/profiles", "location": "resource location", "properties": { - "accessRulesVersion": "0" + "accessRulesVersion": "0", + "diagnosticSettingsVersion": "0" } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfilePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfilePut.json index 50da34f76028..54bfe3eb654e 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfilePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfilePut.json @@ -18,7 +18,8 @@ "type": "Microsoft.Network/networkSecurityPerimeters/profiles", "location": "East US 2 EUAP", "properties": { - "accessRulesVersion": "0" + "accessRulesVersion": "0", + "diagnosticSettingsVersion": "0" } } }, @@ -29,7 +30,8 @@ "type": "Microsoft.Network/networkSecurityPerimeters/profiles", "location": "East US 2 EUAP", "properties": { - "accessRulesVersion": "0" + "accessRulesVersion": "0", + "diagnosticSettingsVersion": "0" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/QueryNSP.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/QueryNSP.json deleted file mode 100644 index 634bb645eee7..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/QueryNSP.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "title": "Post Network Security Perimeter Query by GUID", - "parameters": { - "location": "centraluseuap", - "api-version": "2021-02-01-preview", - "parameters": { - "networkSecurityPerimeters": [ - { - "perimeterGuid": "test" - } - ] - } - }, - "responses": { - "200": { - "body": { - "networkSecurityPerimeters": [ - { - "perimeterGuid": "test", - "id": "xyz" - } - ] - } - } - } -} 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 028970e7db15..c9461e6bbc7a 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 @@ -587,6 +587,9 @@ }, { "$ref": "#/parameters/AssociationNameParameter" + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" } ], "get": { @@ -746,7 +749,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/resourceAssociationProxies/{associationName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/resourceAssociations/{associationName}/reconcile": { "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -759,62 +762,33 @@ }, { "$ref": "#/parameters/AssociationNameParameter" - } - ], - "get": { - "tags": [ - "NspAssociationsProxy" - ], - "operationId": "NspAssociationsProxy_Get", - "description": "Gets the specified NSP association by name.", - "responses": { - "200": { - "description": "OK - Returns information about the NSP resource association.", - "schema": { - "$ref": "#/definitions/NspAssociation" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } }, - "x-ms-examples": { - "NspAssociationGet": { - "$ref": "./examples/NspAssociationGet.json" - } + { + "$ref": "./network.json#/parameters/ApiVersionParameter" } - }, - "put": { + ], + "post": { "tags": [ - "NspAssociationsProxy" + "NspAssociationReconcile" ], - "operationId": "NspAssociationsProxy_CreateOrUpdate", - "description": "Creates or updates a NSP resource association.", + "operationId": "NspAssociationReconcile_Post", + "description": "Reconcile NSP association", "parameters": [ { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/NspAssociation" + "$ref": "#/definitions/NspAssociationReconcile" }, - "description": "Parameters that hold the NspAssociation resource to be created/updated." + "description": "Parameters for NSP association reconcile" } ], "responses": { "200": { - "description": "Updated - Existing resource association is updated. Returns the resource.", + "description": "Reconcile NSP association.", "schema": { - "$ref": "#/definitions/NspAssociation" - } - }, - "201": { - "description": "Create - Returns the NspAssociation resource created.", - "schema": { - "$ref": "#/definitions/NspAssociation" + "$ref": "#/definitions/NspAssociationReconcile" } }, "default": { @@ -825,85 +799,8 @@ } }, "x-ms-examples": { - "NspAssociationPut": { - "$ref": "./examples/NspAssociationPut.json" - } - } - }, - "delete": { - "tags": [ - "NspAssociationsProxy" - ], - "operationId": "NspAssociationsProxy_Delete", - "description": "Deletes an NSP association resource.", - "responses": { - "200": { - "description": "Delete Succeed." - }, - "204": { - "description": "Request successful. The resource does not exist." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "NspAssociationDelete": { - "$ref": "./examples/NspAssociationProxyDelete.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/resourceAssociationProxies": { - "get": { - "tags": [ - "NspAssociationsProxy" - ], - "operationId": "NspAssociationsProxy_List", - "description": "Lists the NSP resource associations.", - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkSecurityPerimeterNameParameter" - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - } - ], - "responses": { - "200": { - "description": "OK - Returns the list of NSP resource associations.", - "schema": { - "$ref": "#/definitions/NspAssociationsListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "NspAssociationList": { - "$ref": "./examples/NspAssociationList.json" + "NspAssociationReconcile": { + "$ref": "./examples/NspAssociationReconcile.json" } } } @@ -947,106 +844,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/profiles/{networkSecurityPerimeterProfile}/checkMembers": { - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkSecurityPerimeterNameParameter" - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/NetworkSecurityPerimeterProfileParameter" - } - ], - "post": { - "tags": [ - "NetworkSecurityPerimetersCheckMembers" - ], - "operationId": "NetworkSecurityPerimeters_CheckMembers", - "description": "Action to check members associated to an NSP Profile", - "parameters": [ - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/CheckMembers" - }, - "description": "Parameter supplied to create the network security perimeter check members." - } - ], - "responses": { - "200": { - "description": "Check members, nothing is getting created or updated.", - "schema": { - "$ref": "#/definitions/CheckMembers" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Post Check Members": { - "$ref": "./examples/NSPCheckMembersPost.json" - } - } - } - }, - "/providers/Microsoft.Network/locations/{location}/queryNetworkSecurityPerimeter": { - "parameters": [ - { - "$ref": "#/parameters/LocationParameter" - } - ], - "post": { - "tags": [ - "QueryNetworkSecurityPerimeters" - ], - "operationId": "NetworkSecurityPerimeters_Query", - "description": "Action to query network security parameter", - "parameters": [ - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/QueryNSPReqRes" - }, - "description": "Parameter supplied to query network security parameter." - } - ], - "responses": { - "200": { - "description": "Query NSP using parameter guid, no resource created or updated.", - "schema": { - "$ref": "#/definitions/QueryNSPReqRes" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Post Query NSP": { - "$ref": "./examples/QueryNSP.json" - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/profiles/{profileName}/accessRules/{accessRuleName}/reconcile": { "parameters": [ { @@ -1117,9 +914,8 @@ "description": "The network security perimeter properties" }, "location": { - "readOnly": true, "type": "string", - "description": "A unique read-only string that changes whenever the resource is updated." + "description": "The location in which NSP is created." }, "name": { "type": "string", @@ -1169,6 +965,7 @@ "description": "The provisioning state of the scope assignment resource." }, "perimeterGuid": { + "readOnly": true, "type": "string", "description": "perimeter guid of the network security perimeter." } @@ -1229,6 +1026,11 @@ "readOnly": true, "type": "string", "description": "Version number that increases with every update to access rules within the profile." + }, + "diagnosticSettingsVersion": { + "readOnly": true, + "type": "string", + "description": "Version number that increases with every update to diagnostic settings within the profile." } }, "description": "Properties of NSP profile." @@ -1317,9 +1119,10 @@ "subscriptions": { "type": "array", "items": { - "type": "string" + "x-ms-client-flatten": true, + "$ref": "#/definitions/SubscriptionId" }, - "description": "Subscription id in the ARM id format." + "description": "List of subscription ids" }, "networkSecurityPerimeters": { "type": "array", @@ -1332,6 +1135,15 @@ }, "description": "Properties of NSP access rule." }, + "SubscriptionId": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Subscription id in the ARM id format." + } + } + }, "PerimeterBasedAccessRule": { "type": "object", "properties": { @@ -1434,6 +1246,11 @@ } } }, + "NspAssociationReconcile": { + "type": "object", + "properties": {}, + "description": "Request object for NSP association." + }, "PerimeterAssociableResource": { "type": "object", "properties": { @@ -1505,79 +1322,6 @@ }, "description": "Properties of the perimeter associable resources." }, - "CheckMembers": { - "type": "object", - "properties": { - "memberDestinations": { - "type": "array", - "items": { - "$ref": "#/definitions/MemberDestination" - }, - "x-ms-identifiers": [ - "privateLinkResourceId" - ] - } - }, - "description": "Request object for check members API." - }, - "MemberDestination": { - "type": "object", - "properties": { - "privateLinkResourceId": { - "type": "string", - "description": "Private link resource Id." - }, - "isMember": { - "type": "string", - "readOnly": true, - "description": "yes/no, if it is member or not.", - "enum": [ - "yes", - "no" - ], - "x-ms-enum": { - "name": "isMember", - "modelAsString": true - } - }, - "profile": { - "readOnly": true, - "type": "string", - "description": "Network security perimeter profile." - } - } - }, - "QueryNSPReqRes": { - "type": "object", - "properties": { - "networkSecurityPerimeters": { - "type": "array", - "items": { - "$ref": "#/definitions/QueryNSPObj" - } - } - }, - "description": "Request object for query NSP." - }, - "QueryNSPObj": { - "type": "object", - "properties": { - "perimeterGuid": { - "type": "string", - "description": "Perimeter guid of NSP." - }, - "id": { - "readOnly": true, - "type": "string", - "description": "Id of NSP." - } - } - }, - "NspAccessRuleReconcile": { - "type": "object", - "properties": {}, - "description": "Request object for NSP reconcile." - }, "NSPProvisioningState": { "type": "string", "readOnly": true, @@ -1594,6 +1338,11 @@ "name": "nspProvisioningState", "modelAsString": true } + }, + "NspAccessRuleReconcile": { + "type": "object", + "properties": {}, + "description": "Request object for NSP reconcile." } }, "parameters": {