Correcting the NodeConfiguration Model and Example (#2870)

Azure · Apr 14, 2018 · 5fb4f0f · 5fb4f0f
1 parent 93b98ca
commit 5fb4f0f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/...ation/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json b/...ation/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json
@@ -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",

diff --git a/...omation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscNodeConfiguration.json b/...omation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscNodeConfiguration.json
@@ -168,7 +168,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties"
+              "$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParameters"
             },
             "description": "The create or update parameters for configuration."
           },
@@ -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": {

diff --git a/...r/Microsoft.Automation/stable/2018-01-15/examples/createOrUpdateDscNodeConfiguration.json b/...r/Microsoft.Automation/stable/2018-01-15/examples/createOrUpdateDscNodeConfiguration.json
@@ -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"
+                }
             }
         }
     },