From dc1da218995ae11653e50dd8c770958f24ffb663 Mon Sep 17 00:00:00 2001 From: Varad Meru Date: Fri, 2 Feb 2018 17:03:58 -0800 Subject: [PATCH] Adding Examples and fixing the DSC related lint issues --- .../stable/2015-10-31/definitions.json | 54 ++++++++++- .../stable/2015-10-31/dscCompilationJob.json | 72 +++++++++++++++ .../stable/2015-10-31/dscConfiguration.json | 10 ++- .../stable/2015-10-31/dscNode.json | 17 +++- .../2015-10-31/dscNodeConfiguration.json | 11 ++- .../compilationJobStreamByJobStreamId.json | 31 +++++++ .../examples/compilationJobStreamList.json | 90 +++++++++++++++++++ .../createOrUpdateDscConfiguration.json | 2 - .../createOrUpdateDscNodeConfiguration.json | 65 +++++++------- .../2015-10-31/examples/deleteDscNode.json | 12 +++ .../examples/deleteDscNodeConfiguration.json | 3 +- .../getAgentRegistrationInformation.json | 22 +++++ .../examples/getDscConfiguration.json | 1 - ...istCompilationJobsByAutomationAccount.json | 45 ++++++++++ .../regenerateAgentRegistrationKey.json | 25 ++++++ 15 files changed, 409 insertions(+), 51 deletions(-) create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamByJobStreamId.json create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamList.json create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNode.json create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getAgentRegistrationInformation.json create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/listCompilationJobsByAutomationAccount.json create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/regenerateAgentRegistrationKey.json diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json index 5d17cfedcc91..f3c3a3fd9cd8 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json @@ -264,10 +264,10 @@ "properties": { "keyName": { "type": "string", - "description": "Gets or sets the agent registration key name - Primary or Secondary.", + "description": "Gets or sets the agent registration key name - primary or secondary.", "enum": [ - "Primary", - "Secondary" + "primary", + "secondary" ], "x-ms-enum": { "name": "AgentRegistrationKeyName", @@ -1128,6 +1128,14 @@ "readOnly": true, "description": "Gets the creation time of the job." }, + "provisioningState": { + "$ref": "#/definitions/ProvisioningStateProperty", + "description": "The current provisioning state of the job." + }, + "runOn": { + "type": "string", + "description": "Gets or sets the runOn which specifies the group name where the job is to be executed." + }, "status": { "type": "string", "description": "Gets or sets the status of the job.", @@ -1201,6 +1209,11 @@ "readOnly": true, "description": "Gets the id of the resource." }, + "name": { + "type": "string", + "readOnly": true, + "description": "Dsc Compilation Job name" + }, "properties": { "$ref": "#/definitions/DscCompilationJobProperties", "x-ms-client-flatten": true, @@ -1320,6 +1333,7 @@ "description": "Definition of the configuration property type." }, "DscConfiguration": { + "type": "object", "properties": { "properties": { "$ref": "#/definitions/DscConfigurationProperties", @@ -1494,7 +1508,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyResource" } ], "description": "Definition of the dsc node type." @@ -1550,6 +1564,7 @@ "description": "Gets or sets the id of the resource." } }, + "x-ms-azure-resource": true, "description": "Definition of the dsc node configuration." }, "DscNodeConfigurationListResult": { @@ -2541,6 +2556,37 @@ "description": "The Resource definition.", "x-ms-azure-resource": true }, + "ProxyResource": { + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type" + } + }, + "description": "The Resource definition.", + "x-ms-azure-resource": true + }, + "ProvisioningStateProperty": { + "properties": { + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The provisioning state of the resource." + } + }, + "description": "The provisioning state property." + }, "RunAsCredentialAssociationProperty": { "properties": { "name": { diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscCompilationJob.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscCompilationJob.json index 7f943882fc0c..95d539b16ef8 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscCompilationJob.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscCompilationJob.json @@ -107,6 +107,11 @@ "externalDocs": { "url": "http://aka.ms/azureautomationsdk/dsccompilationjoboperations" }, + "x-ms-examples": { + "Get a DSC Compilation job": { + "$ref": "./examples/getCompilationJob.json" + } + }, "parameters": [ { "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" @@ -159,6 +164,11 @@ "externalDocs": { "url": "http://aka.ms/azureautomationsdk/compilationjoboperations" }, + "x-ms-examples": { + "List DSC Compilation job in Automation Account": { + "$ref": "./examples/listCompilationJobsByAutomationAccount.json" + } + }, "parameters": [ { "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" @@ -203,6 +213,63 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{jobId}/streams/": { + "get": { + "tags": [ + "DscCompilationJob" + ], + "operationId": "DscCompilationJobStream_ListByJob", + "description": "Retrieve all the job streams for the compilation Job.", + "externalDocs": { + "url": "http://aka.ms/azureautomationsdk/jobstreamoperations" + }, + "x-ms-examples": { + "List DSC Compilation job streams": { + "$ref": "./examples/compilationJobStreamList.json" + } + }, + "parameters": [ + { + "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "automationAccountName", + "in": "path", + "required": true, + "type": "string", + "description": "The automation account name." + }, + { + "name": "jobId", + "in": "path", + "required": true, + "type": "string", + "format": "uuid", + "description": "The job id." + }, + { + "$ref": "./definitions.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "./definitions.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "./definitions.json#/definitions/JobStreamListResult" + } + }, + "default": { + "description": "Automation error response describing why the operation failed.", + "schema": { + "$ref": "./definitions.json#/definitions/ErrorResponse" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{jobId}/streams/{jobStreamId}": { "get": { "tags": [ @@ -213,6 +280,11 @@ "externalDocs": { "url": "http://aka.ms/azureautomationsdk/jobstreamoperations" }, + "x-ms-examples": { + "Get a DSC Compilation job stream by job stream id": { + "$ref": "./examples/compilationJobStreamByJobStreamId.json" + } + }, "parameters": [ { "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscConfiguration.json index 93ccb60d73dd..11043b7a0d59 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscConfiguration.json @@ -9,10 +9,12 @@ "https" ], "consumes": [ - "application/json" + "application/json", + "text/plain; charset=utf-8" ], "produces": [ - "application/json" + "application/json", + "text/plain; charset=utf-8" ], "security": [ { @@ -256,7 +258,7 @@ "200": { "description": "OK", "schema": { - "type": "file" + "type": "string" } }, "default": { @@ -323,4 +325,4 @@ }, "definitions": {}, "parameters": {} -} +} \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNode.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNode.json index e37d025653f4..7775759ae975 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNode.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNode.json @@ -43,6 +43,11 @@ "externalDocs": { "url": "http://aka.ms/azureautomationsdk/agentregistrationoperations" }, + "x-ms-examples": { + "Get Agent Registration Information": { + "$ref": "./examples/getAgentRegistrationInformation.json" + } + }, "parameters": [ { "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" @@ -87,6 +92,11 @@ "externalDocs": { "url": "http://aka.ms/azureautomationsdk/agentregistrationoperations" }, + "x-ms-examples": { + "Regenerate the Primary Agent Registration Key": { + "$ref": "./examples/regenerateAgentRegistrationKey.json" + } + }, "parameters": [ { "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" @@ -140,6 +150,11 @@ "externalDocs": { "url": "http://aka.ms/azureautomationsdk/dscnodeoperations" }, + "x-ms-examples": { + "Delete a DSC Node": { + "$ref": "./examples/deleteDscNode.json" + } + }, "parameters": [ { "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" @@ -537,7 +552,7 @@ "200": { "description": "OK", "schema": { - "type": "file" + "type": "object" } }, "default": { diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNodeConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNodeConfiguration.json index 236192630d21..e53f37e79e46 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNodeConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNodeConfiguration.json @@ -148,6 +148,11 @@ "externalDocs": { "url": "http://aka.ms/azureautomationsdk/dscnodeconfigurations" }, + "x-ms-examples": { + "Get a DSC node configuration": { + "$ref": "./examples/createOrUpdateDscNodeConfiguration.json" + } + }, "parameters": [ { "$ref": "./definitions.json#/parameters/ResourceGroupNameParameter" @@ -189,12 +194,6 @@ "$ref": "./definitions.json#/definitions/DscNodeConfiguration" } }, - "201": { - "description": "Created", - "schema": { - "$ref": "./definitions.json#/definitions/DscNodeConfiguration" - } - }, "default": { "description": "Automation error response describing why the operation failed.", "schema": { diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamByJobStreamId.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamByJobStreamId.json new file mode 100644 index 000000000000..a9b636593296 --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamByJobStreamId.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "automationAccountName": "myAutomationAccount33", + "api-version": "2015-10-31", + "jobId": "836d4e06-2d88-46b4-8500-7febd4906838", + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062421684835_00000000000000000008" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062421684835_00000000000000000008", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838:00636481062421684835:00000000000000000001", + "summary": "", + "time": "2017-12-05T21:30:42.1684835+00:00", + "streamType": "Output", + "streamText": "", + "value": { + "value": "", + "PSComputerName": "localhost", + "PSShowComputerName": true, + "PSSourceJobInstanceId": "836d4e06-2d88-46b4-8500-7febd4906838" + } + } + } + } + } +} \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamList.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamList.json new file mode 100644 index 000000000000..f60b807a8734 --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/compilationJobStreamList.json @@ -0,0 +1,90 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "automationAccountName": "myAutomationAccount33", + "api-version": "2015-10-31", + "jobId": "836d4e06-2d88-46b4-8500-7febd4906838" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062355996678_00000000000000000001", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062355996678_00000000000000000001", + "summary": "836d4e06-2d88-46b4-8500-7febd4906838:[localhost]:The 'Microsoft.PowerShell.Management' module was not imported because the 'Microsoft.PowerShell.Management' snap-in was already imported.", + "time": "2017-12-05T21:30:35.5996678+00:00", + "streamType": "Warning" + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062380840740_00000000000000000002", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062380840740_00000000000000000002", + "summary": "836d4e06-2d88-46b4-8500-7febd4906838:[localhost]:The configuration 'NewDscConfiguration' is loading one or more built-in resources without explicitly importing associated modules. Add Import-DscResource –ModuleName 'PSDesiredStateConfiguration' to your configuration to avoid this message.", + "time": "2017-12-05T21:30:38.084074+00:00", + "streamType": "Warning" + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062384590127_00000000000000000003", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062384590127_00000000000000000003", + "summary": "836d4e06-2d88-46b4-8500-7febd4906838:[localhost]:The 'Microsoft.PowerShell.Management' module was not imported because the 'Microsoft.PowerShell.Management' snap-in was already imported.", + "time": "2017-12-05T21:30:38.4590127+00:00", + "streamType": "Warning" + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062387245395_00000000000000000004", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062387245395_00000000000000000004", + "summary": "836d4e06-2d88-46b4-8500-7febd4906838:[localhost]:The configuration 'NewDscConfiguration' is loading one or more built-in resources without explicitly importing associated modules. Add Import-DscResource –ModuleName 'PSDesiredStateConfiguration' to your configuration to avoid this message.", + "time": "2017-12-05T21:30:38.7245395+00:00", + "streamType": "Warning" + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062417091181_00000000000000000005", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062417091181_00000000000000000005", + "summary": "", + "time": "2017-12-05T21:30:41.7091181+00:00", + "streamType": "Output" + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062418809632_00000000000000000006", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062418809632_00000000000000000006", + "summary": "", + "time": "2017-12-05T21:30:41.8809632+00:00", + "streamType": "Output" + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062420371712_00000000000000000007", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062420371712_00000000000000000007", + "summary": "", + "time": "2017-12-05T21:30:42.0371712+00:00", + "streamType": "Output" + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/836d4e06-2d88-46b4-8500-7febd4906838/streams/836d4e06-2d88-46b4-8500-7febd4906838_00636481062421684835_00000000000000000008", + "properties": { + "jobStreamId": "836d4e06-2d88-46b4-8500-7febd4906838_00636481062421684835_00000000000000000008", + "summary": "", + "time": "2017-12-05T21:30:42.1684835+00:00", + "streamType": "Output" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscConfiguration.json index 79c0df58869e..f9dbe2c17c4e 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscConfiguration.json @@ -36,7 +36,6 @@ "jobCount": 0, "parameters": {}, "description": "sample configuration", - "source": null, "state": null, "creationTime": "0001-01-01T00:00:00+00:00", "lastModifiedTime": "0001-01-01T00:00:00+00:00", @@ -58,7 +57,6 @@ "jobCount": 0, "parameters": {}, "description": "sample configuration", - "source": null, "state": "Published", "creationTime": "2017-03-28T23:14:23.56+00:00", "lastModifiedTime": "2017-03-28T23:14:23.56+00:00", diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscNodeConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscNodeConfiguration.json index cb3d4eb17cb7..f44418b4ec69 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscNodeConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateDscNodeConfiguration.json @@ -1,39 +1,40 @@ { - "parameters": { - "subscriptionId": "subid", - "resourceGroupName": "rg", - "automationAccountName": "myAutomationAccount20", - "credentialName": "myCredential", - "api-version": "2015-10-31", - "parameters":{ - "source": { - "hash": { - "algorithm": "sha256", - "value": "6DE256A57F01BFA29B88696D5E77A383D6E61484C7686E8DB955FA10ACE9FFE5" + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "automationAccountName": "myAutomationAccount20", + "credentialName": "myCredential", + "api-version": "2015-10-31", + "nodeConfigurationName": "configName.nodeConfigName", + "parameters": { + "source": { + "hash": { + "algorithm": "sha256", + "value": "6DE256A57F01BFA29B88696D5E77A383D6E61484C7686E8DB955FA10ACE9FFE5" + }, + "type": "embeddedContent", + "value": "\r\ninstance of MSFT_RoleResource as $MSFT_RoleResource1ref\r\n{\r\nResourceID = \"[WindowsFeature]IIS\";\r\n Ensure = \"Present\";\r\n SourceInfo = \"::3::32::WindowsFeature\";\r\n Name = \"Web-Server\";\r\n ModuleName = \"PsDesiredStateConfiguration\";\r\n\r\nModuleVersion = \"1.0\";\r\r\n ConfigurationName = \"configName\";\r\r\n};\r\ninstance of OMI_ConfigurationDocument\r\n\r\r\n {\r\n Version=\"2.0.0\";\r\n \r\r\n MinimumCompatibleVersion = \"1.0.0\";\r\n \r\r\n CompatibleVersionAdditionalProperties= {\"Omi_BaseResource:ConfigurationName\"};\r\n \r\r\n Author=\"weijiel\";\r\n \r\r\n GenerationDate=\"03/30/2017 13:40:25\";\r\n \r\r\n GenerationHost=\"TEST-BACKEND\";\r\n \r\r\n Name=\"configName\";\r\n\r\r\n };\r\n", + "version": "1.0" }, - "type": "embeddedContent", - "value": "\r\ninstance of MSFT_RoleResource as $MSFT_RoleResource1ref\r\n{\r\nResourceID = \"[WindowsFeature]IIS\";\r\n Ensure = \"Present\";\r\n SourceInfo = \"::3::32::WindowsFeature\";\r\n Name = \"Web-Server\";\r\n ModuleName = \"PsDesiredStateConfiguration\";\r\n\r\nModuleVersion = \"1.0\";\r\r\n ConfigurationName = \"configName\";\r\r\n};\r\ninstance of OMI_ConfigurationDocument\r\n\r\r\n {\r\n Version=\"2.0.0\";\r\n \r\r\n MinimumCompatibleVersion = \"1.0.0\";\r\n \r\r\n CompatibleVersionAdditionalProperties= {\"Omi_BaseResource:ConfigurationName\"};\r\n \r\r\n Author=\"weijiel\";\r\n \r\r\n GenerationDate=\"03/30/2017 13:40:25\";\r\n \r\r\n GenerationHost=\"WEIJIEL-BACKEND\";\r\n \r\r\n Name=\"configName\";\r\n\r\r\n };\r\n", - "version": "1.0" - }, - "newNodeConfigurationBuildVersionRequired": true, - "name": "nodeConfigName", - "configuration": { - "name": "configName" - } - } - }, - "responses": { - "200": { - "headers":{}, - "body": { - "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount20/nodeConfigurations/nodeConfigName", + "newNodeConfigurationBuildVersionRequired": true, + "name": "configName.nodeConfigName", "configuration": { "name": "configName" - }, - "creationTime": "2017-06-16T01:18:39.010771+00:00", - "lastModifiedTime": "2017-06-16T01:18:39.010771+00:00", - "name": "nodeConfigName" } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount20/nodeConfigurations/nodeConfigName", + "configuration": { + "name": "configName" + }, + "creationTime": "2017-06-16T01:18:39.010771+00:00", + "lastModifiedTime": "2017-06-16T01:18:39.010771+00:00", + "name": "nodeConfigName" + } + } } - } } \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNode.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNode.json new file mode 100644 index 000000000000..a6ac74b7d326 --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNode.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "automationAccountName": "myAutomationAccount9", + "api-version": "2015-10-31", + "nodeId": "e1243a76-a9bd-432f-bde3-ad8f317ee786" + }, + "responses": { + "200": {} + } +} \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNodeConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNodeConfiguration.json index fce2d60f8941..48c7039e7037 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNodeConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteDscNodeConfiguration.json @@ -4,7 +4,8 @@ "resourceGroupName": "rg", "automationAccountName": "myAutomationAccount20", "credentialName": "myCredential", - "api-version": "2015-10-31" + "api-version": "2015-10-31", + "nodeConfigurationName": "configName.nodeConfigName" }, "responses": { "200": {} diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getAgentRegistrationInformation.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getAgentRegistrationInformation.json new file mode 100644 index 000000000000..da8d41c73664 --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getAgentRegistrationInformation.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "automationAccountName": "myAutomationAccount33", + "api-version": "2015-10-31" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/agentRegistrationInformation/https://wcus-agentservice-prod-1.azure-automation.net/accounts/ea8cd428-7887-4020-883d-ec6c5f2c06c2", + "keys": { + "primary": "MDt********************************************************wEMg==", + "secondary": "UM4A********************************************************66pg==" + }, + "endpoint": "https://wcus-agentservice-prod-1.azure-automation.net/accounts/ea8cd428-7887-4020-883d-ec6c5f2c06c2", + "dscMetaConfiguration": "\r\n\tinstance of MSFT_WebDownloadManager as $MSFT_WebDownloadManager1ref\r\n\t{\r\n\tResourceID = \"[ConfigurationRepositoryWeb]AzureAutomationDSC\";\r\n\t SourceInfo = \"C:\\\\OaaS-RegistrationMetaConfig2.ps1::20::9::ConfigurationRepositoryWeb\";\r\n\t RegistrationKey = \"MDt********************************************************wEMg==\"; \r\n\t ServerURL = \"https://wcus-agentservice-prod-1.azure-automation.net/accounts/ea8cd428-7887-4020-883d-ec6c5f2c06c2\";\r\n\t};\r\n\r\n\tinstance of MSFT_WebResourceManager as $MSFT_WebResourceManager1ref\r\n\t{\r\n\t SourceInfo = \"C:\\\\OaaS-RegistrationMetaConfig2.ps1::27::9::ResourceRepositoryWeb\";\r\n\t ServerURL = \"https://wcus-agentservice-prod-1.azure-automation.net/accounts/ea8cd428-7887-4020-883d-ec6c5f2c06c2\";\r\n\t ResourceID = \"[ResourceRepositoryWeb]AzureAutomationDSC\";\r\n\t RegistrationKey = \"MDt********************************************************wEMg==\"; \r\n\t};\r\n\r\n\tinstance of MSFT_WebReportManager as $MSFT_WebReportManager1ref\r\n\t{\r\n\t SourceInfo = \"C:\\\\OaaS-RegistrationMetaConfig2.ps1::34::9::ReportServerWeb\";\r\n\t ServerURL = \"https://wcus-agentservice-prod-1.azure-automation.net/accounts/ea8cd428-7887-4020-883d-ec6c5f2c06c2\";\r\n\t ResourceID = \"[ReportServerWeb]AzureAutomationDSC\";\r\n\t RegistrationKey = \"MDt********************************************************wEMg==\"; \r\n\t};\r\n\r\n\tinstance of MSFT_DSCMetaConfiguration as $MSFT_DSCMetaConfiguration1ref\r\n\t{\r\n\t RefreshMode = \"Pull\";\r\n\t AllowModuleOverwrite = False;\r\n\t ActionAfterReboot = \"ContinueConfiguration\";\r\n\t RefreshFrequencyMins = 30;\r\n\t RebootNodeIfNeeded = False;\r\n\t ConfigurationModeFrequencyMins = 15;\r\n\t ConfigurationMode = \"ApplyAndMonitor\";\r\n\r\n\t ResourceModuleManagers = {\r\n\t $MSFT_WebResourceManager1ref \r\n\t};\r\n\t ReportManagers = {\r\n\t $MSFT_WebReportManager1ref \r\n\t };\r\n\t ConfigurationDownloadManagers = {\r\n\t $MSFT_WebDownloadManager1ref \r\n\t };\r\n\t};\r\n\r\n\tinstance of OMI_ConfigurationDocument\r\n\t{\r\n\t Version=\"2.0.0\";\r\n\t MinimumCompatibleVersion = \"2.0.0\";\r\n\t CompatibleVersionAdditionalProperties= { \"MSFT_DSCMetaConfiguration:StatusRetentionTimeInDays\" };\r\n\t Author=\"azureautomation\";\r\n\t GenerationDate=\"04/17/2015 11:41:09\";\r\n\t GenerationHost=\"azureautomation-01\";\r\n\t Name=\"RegistrationMetaConfig\";\r\n\t};\r\n\t" + } + } + } +} \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getDscConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getDscConfiguration.json index 234116ab5c6d..1dced19804d6 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getDscConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getDscConfiguration.json @@ -21,7 +21,6 @@ "jobCount": 0, "parameters": {}, "description": "sample configuration", - "source": null, "state": "Published", "creationTime": "2017-03-28T23:14:23.56+00:00", "lastModifiedTime": "2017-03-28T23:14:23.56+00:00", diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/listCompilationJobsByAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/listCompilationJobsByAutomationAccount.json new file mode 100644 index 000000000000..f32fdc0bd568 --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/listCompilationJobsByAutomationAccount.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "automationAccountName": "myAutomationAccount33", + "api-version": "2015-10-31" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/e6e7fbab-183c-405a-afe6-9eb5db97921a", + "properties": { + "jobId": "e6e7fbab-183c-405a-afe6-9eb5db97921a", + "configuration": { + "name": "TestDscConfiguration" + }, + "status": "Suspended", + "creationTime": "2017-11-17T19:45:24.59+00:00", + "startTime": "2017-11-17T19:45:52.9833333+00:00", + "lastModifiedTime": "2017-11-17T19:45:58.5933333+00:00", + "endTime": null + } + }, + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/compilationjobs/111d4e06-2d88-46b4-8500-7febd4906838", + "properties": { + "jobId": "111d4e06-2d88-46b4-8500-7febd4906838", + "configuration": { + "name": "NewDscConfiguration" + }, + "status": "Completed", + "creationTime": "2017-12-05T21:29:07.74+00:00", + "startTime": "2017-12-05T21:30:26.48+00:00", + "lastModifiedTime": "2017-12-05T21:30:42.6+00:00", + "endTime": "2017-12-05T21:30:42.6+00:00" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/regenerateAgentRegistrationKey.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/regenerateAgentRegistrationKey.json new file mode 100644 index 000000000000..b61163bb374e --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/regenerateAgentRegistrationKey.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "automationAccountName": "myAutomationAccount33", + "api-version": "2015-10-31", + "parameters": { + "keyName": "primary" + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": null, + "keys": { + "primary": "DXW********************************************************ZqnQ==", + "secondary": "UM4A********************************************************66pg==" + }, + "endpoint": "https://wcus-agentservice-prod-1.azure-automation.net/accounts/ea8cd428-7887-4020-883d-ec6c5f2c06c2", + "dscMetaConfiguration": null + } + } + } +} \ No newline at end of file