From ac08ac20e9f80589cccd04e90290411ed1a12c92 Mon Sep 17 00:00:00 2001 From: Raj Shah Date: Sun, 8 Jul 2018 16:42:03 -0700 Subject: [PATCH 1/2] Update get entities to include two fields --- .../examples/GetEntities.json | 9 +++++--- .../2018-03-01-preview/management.json | 21 ++++++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/examples/GetEntities.json b/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/examples/GetEntities.json index 91a26cba5065..d233d7d30ea0 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/examples/GetEntities.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/examples/GetEntities.json @@ -21,7 +21,9 @@ "inheritedPermissions": "view", "parentDisplayNameChain": ["Tenant Root Group", "Group 1 Tenant 2 Parent"], "parentNameChain": ["TenantRootGroup", "Group1Tenant2Parent"], - "numberOfDescendants": 2 + "numberOfDescendants": 3, + "numberOfChildren": 2, + "numberOfChildGroups": 1 } }, { @@ -38,8 +40,9 @@ "inheritedPermissions": "delete", "parentDisplayNameChain": ["Tenant Root Group", "Group 4 Tenant 2 Parent"], "parentNameChain": ["TenantRootGroup", "Group4 Tenant2Parent"], - "numberOfDescendants": 0 - } + "numberOfDescendants": 0, + "numberOfChildren": 0, + "numberOfChildGroups": 0 } } ], "nextLink": null diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json index 691c4f2d8eaf..61e553ec5a5c 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json @@ -955,6 +955,11 @@ "$ref": "#/definitions/EntityInfo" } }, + "count": { + "description": "Total count of recors that match the filter", + "type": "integer", + "readOnly": true + }, "nextLink": { "description": "The URL to use for getting the next set of results.", "type": "string", @@ -1024,6 +1029,18 @@ "type": "integer", "x-nullable": true }, + "numberOfChildren": { + "title": "Number of Children", + "description": "Number of children is the number of Groups and Subscriptions that are exactly one level underneath the current Group.", + "type": "integer", + "x-nullable": true + }, + "numberOfChildGroups": { + "title": "Number of Child Groups", + "description": "Number of child groups is the number of Groups that are exactly one level underneath the current Group.", + "type": "integer", + "x-nullable": true + }, "parentDisplayNameChain": { "type": "array", "description": "The parent display name chain from the root group to the immediate parent", @@ -1407,7 +1424,9 @@ "enum": [ "AllowedParents", "AllowedChildren", - "ParentAndFirstLevelChildren" + "ParentAndFirstLevelChildren", + "ParentOnly", + "ChildrenOnly" ], "x-ms-parameter-location": "method", "description": "The $search parameter is used in conjunction with the $filter parameter to return three different outputs depending on the parameter passed in. With $search=AllowedParents the API will return the entity info of all groups that the requested entity will be able to reparent to as determined by the user's permissions. With $search=AllowedChildren the API will return the entity info of all entities that can be added as children of the requested entity. With $search=ParentAndFirstLevelChildren the API will return the parent and first level of children that the user has either direct access to or indirect access via one of their descendants." From d10627c812da0c06abf2fe30cf4594a46d8ab0c8 Mon Sep 17 00:00:00 2001 From: Raj Shah Date: Mon, 16 Jul 2018 11:56:09 -0700 Subject: [PATCH 2/2] Fix a typo --- .../preview/2018-03-01-preview/management.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json index 61e553ec5a5c..f517d090124c 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/preview/2018-03-01-preview/management.json @@ -956,7 +956,7 @@ } }, "count": { - "description": "Total count of recors that match the filter", + "description": "Total count of records that match the filter", "type": "integer", "readOnly": true },