Skip to content

Refactoring DSCNodeConfigurationCreate Parameters #3012

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
sergey-shandar merged 2 commits into from
May 14, 2018
Merged

Refactoring DSCNodeConfigurationCreate Parameters #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed80b6e
Refacroting DSCNodeConfigurationCreate Parameters
vrdmr Apr 25, 2018
cde3c01
Fix the return model for Get NodeConfig call
vrdmr May 8, 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
26 changes: 0 additions & 26 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 @@ -1482,32 +1482,6 @@
},
"description": "Definition of the DSC Meta Configuration."
},
"DscNodeConfigurationCreateOrUpdateParameters": {
Copy link
Member Author

@vrdmr vrdmr May 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved these definitions to 2015-10-31/DscNodeConfiguration.json

"properties": {
"source": {
"$ref": "#/definitions/ContentSource",
"description": "Gets or sets the source."
},
"name": {
"type": "string",
"description": "Name of the node configuration."
},
"configuration": {
"$ref": "#/definitions/DscConfigurationAssociationProperty",
"description": "Gets or sets the configuration of the node."
},
"newNodeConfigurationBuildVersionRequired": {
"type": "boolean",
"description": "If a new build version of NodeConfiguration is required."
}
},
"required": [
"source",
"name",
"configuration"
],
"description": "The parameters supplied to the create or update node configuration operation."
},
"DscNodeConfigurationAssociationProperty": {
"properties": {
"name": {
Expand Down
74 changes: 73 additions & 1 deletion ...omation/resource-manager/Microsoft.Automation/stable/2015-10-31/dscNodeConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "./definitions.json#/definitions/DscNodeConfigurationCreateOrUpdateParameters"
"$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParameters"
},
"description": "The create or update parameters for configuration."
},
Expand Down Expand Up @@ -293,6 +293,78 @@
],
"description": "Definition of the dsc node configuration."
},
"ContentSource": {
Copy link
Member Author

@vrdmr vrdmr May 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the definitions from Defnitions.json to this file.

"properties": {
"hash": {
"$ref": "#/definitions/ContentHash",
"description": "Gets or sets the hash."
},
"type": {
"type": "string",
"description": "Gets or sets the content source type.",
"enum": [
"embeddedContent",
"uri"
],
"x-ms-enum": {
"name": "ContentSourceType",
"modelAsString": true
}
},
"value": {
"type": "string",
"description": "Gets or sets the value of the content. This is based on the content source type."
},
"version": {
"type": "string",
"description": "Gets or sets the version of the content."
}
},
"description": "Definition of the content source."
},
"ContentHash": {
"properties": {
"algorithm": {
"type": "string",
"description": "Gets or sets the content hash algorithm used to hash the content."
},
"value": {
"type": "string",
"description": "Gets or sets expected hash value of the content."
}
},
"required": [
"algorithm",
"value"
],
"description": "Definition of the runbook property type."
},
"DscNodeConfigurationCreateOrUpdateParameters": {
"properties": {
"source": {
"$ref": "#/definitions/ContentSource",
"description": "Gets or sets the source."
},
"name": {
"type": "string",
"description": "Name of the node configuration."
},
"configuration": {
"$ref": "./definitions.json#/definitions/DscConfigurationAssociationProperty",
"description": "Gets or sets the configuration of the node."
},
"incrementNodeConfigurationBuild": {
"type": "boolean",
"description": "If a new build version of NodeConfiguration is required."
}
},
"required": [
"source",
"name",
"configuration"
],
"description": "The parameters supplied to the create or update node configuration operation."
},
"DscNodeConfigurationListResult": {
"properties": {
"value": {
Expand Down
8 changes: 2 additions & 6 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 @@ -413,6 +413,7 @@
"description": "The dsc extensionHandler property associated with the node"
},
"DscNodeConfigurationCreateOrUpdateParameters": {
"description": "The parameters supplied to the create or update node configuration operation.",
"properties": {
"properties": {
"$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties",
Expand All @@ -438,10 +439,6 @@
"$ref": "#/definitions/ContentSource",
"description": "Gets or sets the source."
},
"name": {
Copy link
Member Author

@vrdmr vrdmr May 8, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Corrected the model. The Name is not in the top-level property for the Body Parameter.

"type": "string",
"description": "Gets or sets the type of the parameter."
},
"configuration": {
"$ref": "#/definitions/DscConfigurationAssociationProperty",
"description": "Gets or sets the configuration of the node."
Expand All @@ -453,10 +450,9 @@
},
"required": [
"source",
"name",
"configuration"
],
"description": "The parameters supplied to the create or update node configuration operation."
"description": "The parameter properties supplied to the create or update node configuration operation."
},
"DscConfigurationAssociationProperty": {
"properties": {
Expand Down
2 changes: 0 additions & 2 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 @@ -3,7 +3,6 @@
"subscriptionId": "subid",
"resourceGroupName": "rg",
"automationAccountName": "myAutomationAccount20",
"credentialName": "myCredential",
Copy link
Member Author

@vrdmr vrdmr May 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was wrong param being sent in the example.

"api-version": "2018-01-15",
"nodeConfigurationName": "configName.nodeConfigName",
"parameters": {
Expand All @@ -19,7 +18,6 @@
"version": "1.0"
},
"incrementNodeConfigurationBuild": true,
"name": "configName.nodeConfigName",
"configuration": {
"name": "configName"
}
Expand Down