Skip to content
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

Correcting the NodeConfiguration Model and Example #2870

Merged
merged 1 commit into from
Apr 14, 2018
Merged

Correcting the NodeConfiguration Model and Example #2870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...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 @@ -1481,7 +1481,7 @@
},
"name": {
"type": "string",
"description": "Gets or sets the type of the parameter."
"description": "Name of the node configuration."
},
"configuration": {
"$ref": "#/definitions/DscConfigurationAssociationProperty",
Expand Down
22 changes: 21 additions & 1 deletion ...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 @@ -168,7 +168,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties"
"$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParameters"
},
"description": "The create or update parameters for configuration."
},
Expand Down Expand Up @@ -381,6 +381,26 @@
},
"description": "The dsc extensionHandler property associated with the node"
},
"DscNodeConfigurationCreateOrUpdateParameters": {
"properties": {
"properties": {
"$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties",
"x-ms-client-flatten": true,
"description": "Node configuration properties"
},
"name": {
"type": "string",
"description": "Name of the node configuration."
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Gets or sets the tags attached to the resource."
}
}
},
"DscNodeConfigurationCreateOrUpdateParametersProperties": {
"properties": {
"source": {
Expand Down
27 changes: 15 additions & 12 deletions ...r/Microsoft.Automation/stable/2018-01-15/examples/createOrUpdateDscNodeConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,22 @@
"api-version": "2018-01-15",
"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"
},
"incrementNodeConfigurationBuild": true,
"name": "configName.nodeConfigName",
"configuration": {
"name": "configName"
"properties": {
"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"
},
"incrementNodeConfigurationBuild": true,
"name": "configName.nodeConfigName",
"configuration": {
"name": "configName"
}
}
}
},
Expand Down