Move DataCollection into the Privacy node of the Extension Settings

Author: TravisEz13

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs

@@ -10,6 +10,7 @@
 using Microsoft.WindowsAzure.Storage.Blob;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Management.Automation;
@@ -320,7 +321,11 @@ private void CreateConfiguration()
 
                 publicSettings.SasToken = configurationUris.SasToken;
                 publicSettings.ModulesUrl = configurationUris.ModulesUrl;
-                publicSettings.DataCollection = DataCollection;
+
+                Hashtable privacySetting = new Hashtable();
+                privacySetting.Add("DataCollection", DataCollection);
+                publicSettings.Privacy = privacySetting;
+
                 publicSettings.ConfigurationFunction = string.Format(
                     CultureInfo.InvariantCulture,
                     "{0}\\{1}",

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/DscExtensionPublicSettings.cs

@@ -92,6 +92,11 @@ public class Property
         /// </summary>
         public Property[] Properties { get; set; }
 
+        /// <summary>
+        /// Privacy parameters
+        /// </summary>
+        public Hashtable Privacy { get; set; }
+
         /// <summary>
         /// Version of the protocol (DscExtensionPublicSettings and DscExtensionPrivateSettings mostly).
         /// </summary>
@@ -102,14 +107,5 @@ public class Property
         /// on the VM.
         /// </summary>
         public string WmfVersion { get; set; }
-    
-        /// <summary>
-        /// String to set the state of the the extension data collection.
-        /// Enable will enable
-        /// Disable will disable
-        /// Null or empty will leave it in the last state.
-        /// The default is Enabled.
-        /// </summary>
-        public string DataCollection { get; set; }
     }
 }

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs

@@ -23,6 +23,7 @@
 using Microsoft.WindowsAzure.Storage.Blob;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Management.Automation;
@@ -400,7 +401,11 @@ private void CreateConfiguration()
 
                 publicSettings.SasToken = configurationUris.SasToken;
                 publicSettings.ModulesUrl = configurationUris.ModulesUrl;
-                publicSettings.DataCollection = this.DataCollection;
+                
+                Hashtable privacySetting = new Hashtable();
+                privacySetting.Add("DataCollection",DataCollection);
+                publicSettings.Privacy = privacySetting;
+
                 publicSettings.ConfigurationFunction = string.Format(
                     CultureInfo.InvariantCulture,
                     "{0}\\{1}",