Skip to content

Dsc paging changes #2931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martin Strobel (marstr) merged 4 commits into from
May 2, 2018
Merged

Dsc paging changes #2931

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91ed442
Dsc paging changes
Apr 23, 2018
5c04279
Add missing fields to spec
Apr 24, 2018
88346bc
Ammend description
Apr 24, 2018
376277f
add x-ms-odata to dscConfiguration
Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ation/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,12 @@
"description": "Gets or sets the last modified time.",
"x-nullable": false
},
"nodeConfigurationCount": {
"type": "integer",
"format": "int64",
"description": "Gets the number of compiled node configurations.",
"x-nullable": false
},
"description": {
"type": "string",
"description": "Gets or sets the description."
Expand Down
8 changes: 7 additions & 1 deletion .../automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,13 @@
"x-ms-examples": {
"Get DSC Configuration": {
"$ref": "./examples/getAllDscConfigurations.json"
}
},
"List Paged DSC Configurations with no filter": {
"$ref": "./examples/getPagedDscConfigurationsWithNoFilter.json"
},
"List Paged DSC Configurations with name filter": {
"$ref": "./examples/getPagedlDscConfigurationsWithNameFilter.json"
}
},
"parameters": [
{
Expand Down
56 changes: 56 additions & 0 deletions ...icrosoft.Automation/stable/2015-10-31/examples/getPagedDscConfigurationsWithNoFilter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"automationAccountName": "myAutomationAccount33",
"api-version": "2015-10-31",
"$skip": 0,
"$top": 3,
"$inlinecount": "allpages"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/configurations/SqlServerBig",
"location": "East US 2",
"name": "SqlServerBig",
"type": "Microsoft.Automation/AutomationAccounts/Configurations",
"properties": {
"state": "Published",
"creationTime": "2017-03-28T18:53:24.997+00:00",
"lastModifiedTime": "2017-03-28T18:53:24.997+00:00",
"nodeConfigurationCount": 1
}
},
{
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/configurations/SqlServerLittle",
"location": "East US 2",
"name": "SqlServerLittle",
"type": "Microsoft.Automation/AutomationAccounts/Configurations",
"properties": {
"state": "Published",
"creationTime": "2017-03-28T18:53:24.997+00:00",
"lastModifiedTime": "2017-03-28T18:53:24.997+00:00",
"nodeConfigurationCount": 1
}
},
{
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/configurations/SetupServer",
"location": "East US 2",
"name": "SetupServer",
"type": "Microsoft.Automation/AutomationAccounts/Configurations",
"properties": {
"state": "Published",
"creationTime": "2017-03-28T18:53:24.997+00:00",
"lastModifiedTime": "2017-03-28T18:53:24.997+00:00"
}
}
],
"totalCount": 12
}
}
}
}
46 changes: 46 additions & 0 deletions ...osoft.Automation/stable/2015-10-31/examples/getPagedlDscConfigurationsWithNameFilter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"automationAccountName": "myAutomationAccount33",
"api-version": "2015-10-31",
"$skip": 0,
"$top": 2,
"$inlinecount": "allpages",
"$filter": "contains(name,'server')"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/configurations/SqlServerBig",
"location": "East US 2",
"name": "SqlServerBig",
"type": "Microsoft.Automation/AutomationAccounts/Configurations",
"properties": {
"state": "Published",
"creationTime": "2017-03-28T18:53:24.997+00:00",
"lastModifiedTime": "2017-03-28T18:53:24.997+00:00",
"nodeConfigurationCount": 1
}
},
{
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/configurations/SqlServerLittle",
"location": "East US 2",
"name": "SqlServerLittle",
"type": "Microsoft.Automation/AutomationAccounts/Configurations",
"properties": {
"state": "Published",
"creationTime": "2017-03-28T18:53:24.997+00:00",
"lastModifiedTime": "2017-03-28T18:53:24.997+00:00",
"nodeConfigurationCount": 1
}
}
],
"totalCount": 4
}
}
}
}
51 changes: 51 additions & 0 deletions ...ification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscNode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,27 @@
"x-ms-examples": {
"List DSC nodes by Automation Account": {
"$ref": "./examples/listAllDscNodesByAutomationAccount.json"
},
"List Paged DSC nodes by Automation Account with no filters": {
"$ref": "./examples/listPagedDscNodesByAutomationAccountWithNoFilter.json"
},
"List Paged DSC nodes by Automation Account with name filter": {
"$ref": "./examples/listPagedDscNodesByAutomationAccountWithNameFilter.json"
},
"List Paged DSC nodes by Automation Account with node status filter": {
"$ref": "./examples/listPagedDscNodesByAutomationAccountWithStatusFilter.json"
},
"List Paged DSC nodes by Automation Account with Node Configuration Custom filter": {
"$ref": "./examples/listPagedDscNodesByAutomationAccountWithNodeConfigurationCustomFilter.json"
},
"List Paged DSC nodes by Automation Account where Node Configurations are not assigned filter": {
"$ref": "./examples/listPagedDscNodesByAutomationAccountWithNodeConfigurationNotAssignedFilter.json"
},
"List Paged DSC nodes by Automation Account with version filter": {
"$ref": "./examples/listPagedDscNodesByAutomationAccountWithVersionFilter.json"
},
"List Paged DSC nodes with filters separated by 'and'": {
"$ref": "./examples/listPagedDscNodesByAutomationAccountWithCompositeFilter.json"
}
},
"parameters": [
Expand All @@ -326,6 +347,27 @@
"type": "string",
"description": "The filter to apply on the operation."
},
{
"name": "$skip",
"in": "query",
"required": false,
"type": "integer",
"description": "The number of rows to skip."
},
{
"name": "$top",
"in": "query",
"required": false,
"type": "integer",
"description": "The the number of rows to take."
},
{
"name": "$inlinecount",
"in": "query",
"required": false,
"type": "string",
"description": "Return total rows."
},
{
"$ref": "./definitions.json#/parameters/SubscriptionIdParameter"
},
Expand Down Expand Up @@ -849,6 +891,7 @@
"description": "Gets or sets the account id of the node."
},
"nodeConfiguration": {
"x-nullable": true,
"x-ms-client-flatten": true,
"$ref": "#/definitions/DscNodeConfigurationAssociationProperty",
"description": "Gets or sets the configuration of the node."
Expand All @@ -865,6 +908,10 @@
"type": "string",
"description": "Gets or sets the etag of the resource."
},
"totalCount": {
"type": "integer",
"description": "Gets the total number of records matching filter criteria."
},
"extensionHandler": {
"type": "array",
"description": "Gets or sets the list of extensionHandler properties for a Node.",
Expand Down Expand Up @@ -945,6 +992,10 @@
"nextLink": {
"type": "string",
"description": "Gets or sets the next link."
},
"totalCount": {
"type": "integer",
"description": "Gets the total number of nodes matching filter criteria."
}
},
"description": "The response model for the list dsc nodes operation."
Expand Down
31 changes: 31 additions & 0 deletions ...omation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscNodeConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@
"x-ms-examples": {
"List DSC node configurations by Automation Account": {
"$ref": "./examples/listDscNodeConfigurations.json"
},
"List Paged DSC node configurations by Automation Account with no filter": {
"$ref": "./examples/listPagedDscNodeConfigurationsWithNoFilter.json"
},
"List Paged DSC node configurations by Automation Account with name filter": {
"$ref": "./examples/listPagedDscNodeConfigurationsWithNameFilter.json"
}
},
"parameters": [
Expand All @@ -232,6 +238,27 @@
"required": false,
"type": "string",
"description": "The filter to apply on the operation."
},
{
"name": "$skip",
"in": "query",
"required": false,
"type": "integer",
"description": "The number of rows to skip."
},
{
"name": "$top",
"in": "query",
"required": false,
"type": "integer",
"description": "The the number of rows to take."
},
{
"name": "$inlinecount",
"in": "query",
"required": false,
"type": "string",
"description": "Return total rows."
}
],
"responses": {
Expand Down Expand Up @@ -364,6 +391,10 @@
"nextLink": {
"type": "string",
"description": "Gets or sets the next link."
},
"totalCount": {
"type": "integer",
"description": "Gets or sets the total rows in query."
}
},
"description": "The response model for the list job operation."
Expand Down
Loading