Merge pull request #20 from AzCiS/fix-set-vd

Fix set vd

Author: avirupch

src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleVirtualDevice.cs

@@ -38,25 +38,18 @@ public class SetAzureStorSimpleVirtualDevice : StorSimpleCmdletBase
         [Parameter(Mandatory = true, Position = 0, HelpMessage = StorSimpleCmdletHelpMessage.DeviceName)]
         [ValidateNotNullOrEmpty] 
         public string DeviceName { get; set; }
-
-        /// <summary>
-        /// New friendly name for the device.
-        /// </summary>
-        [Parameter(Mandatory=false, Position = 1, HelpMessage = StorSimpleCmdletHelpMessage.NewDeviceName)]
-        [ValidateNotNullOrEmpty]
-        public string NewName { get; set; }
 
         /// <summary>
         /// TimeZone for the device.
         /// </summary>
-        [Parameter(Mandatory = false, Position = 2, HelpMessage = StorSimpleCmdletHelpMessage.TimeZone, ValueFromPipeline=true)]
+        [Parameter(Mandatory = false, Position = 1, HelpMessage = StorSimpleCmdletHelpMessage.TimeZone, ValueFromPipeline=true)]
         [ValidateNotNullOrEmpty] 
         public TimeZoneInfo TimeZone { get; set; }
 
         /// <summary>
         /// Service Encryption Key for the resource.
         /// </summary>
-        [Parameter(Mandatory=true, Position = 3, HelpMessage = StorSimpleCmdletHelpMessage.SEK)]
+        [Parameter(Mandatory=true, Position = 2, HelpMessage = StorSimpleCmdletHelpMessage.SEK)]
         [ValidateNotNullOrEmpty]
         public string SecretKey { get; set; }
 
@@ -76,8 +69,11 @@ public override void ExecuteCmdlet()
                 // Get the current device details. ( If we found id from the name, this call is bound to succeed)
                 var deviceDetails = StorSimpleClient.GetDeviceDetails(deviceId);
 
+                // The cik also needs to be sent to the service.
+                string cik = EncryptionCmdLetHelper.RetrieveCIK(this, StorSimpleContext.ResourceId);
+
                 // Update device details.
-                StorSimpleClient.UpdateVirtualDeviceDetails(deviceDetails, NewName, TimeZone, SecretKey);
+                StorSimpleClient.UpdateVirtualDeviceDetails(deviceDetails, TimeZone, SecretKey, cik);
 
                 // Make request with updated data
                 WriteVerbose(string.Format(Resources.BeginningDeviceConfiguration, deviceDetails.DeviceProperties.FriendlyName));

src/ServiceManagement/StorSimple/Commands.StorSimple/ServiceClients/StorSimpleDevicesClient.cs

@@ -20,6 +20,7 @@
 using Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets.Library;
 using System.Net;
 using System.Net.Sockets;
+using Microsoft.WindowsAzure.Commands.StorSimple.Encryption;
 
 namespace Microsoft.WindowsAzure.Commands.StorSimple
 {
@@ -201,12 +202,8 @@ private void UpdateDeviceDetailsObject(DeviceDetails deviceDetails, string newNa
             deviceDetails.WebProxy = null;
         }
 
-        public void UpdateVirtualDeviceDetails(DeviceDetails details, string newName, TimeZoneInfo timeZone, string sek)
+        public void UpdateVirtualDeviceDetails(DeviceDetails details, TimeZoneInfo timeZone, string sek, string cik)
         {
-            if (newName != null)
-            {
-                details.DeviceProperties.FriendlyName = newName;
-            }
             if (timeZone != null)
             {
                 details.TimeServer.TimeZone = timeZone.StandardName;
@@ -216,8 +213,16 @@ public void UpdateVirtualDeviceDetails(DeviceDetails details, string newName, Ti
 
             details.VirtualApplianceProperties.EncodedServiceEncryptionKey = encryptedSecretKey;
 
+            // Also set the CIK before making the request - service needs it.
+            var encryptedCik = this.EncryptWithDevicePublicKey(details.DeviceProperties.DeviceId, cik);
+
+            details.VirtualApplianceProperties.EncodedChannelIntegrityKey = encryptedCik;
+
+            details.VirtualApplianceProperties.IsServiceEncryptionKeySet = true;
+
             // mark everything that we dont intend to modify as null - indicating
             // to the service that there has been no change
+            details.DeviceProperties = null;
             details.AlertNotification = null;
             details.Chap = null;
             details.DnsServer = null;