Update Diagnostics Extension cmdlets and tests for Swagger library

hyonholee · hyonholee · commit b999f76ecc84 · 2015-12-21T22:52:44.000-08:00
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1
@@ -120,7 +120,7 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
     # VM Profile & Hardware
     $vmsize = 'Standard_A2';
     $p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
-    Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
+    Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
 
     # NRP
     $subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
@@ -136,7 +136,7 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
 
     $p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
     Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
-    Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
+    Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
 
     # Storage Account (SA)
     $stoname = 'sto' + $rgname;
@@ -159,18 +159,18 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
     $p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
     $p = Remove-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3';
 
-    Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
-    Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
-    Assert-AreEqual $p.StorageProfile.OSDisk.VirtualHardDisk.Uri $osDiskVhdUri;
+    Assert-AreEqual $p.StorageProfile.OsDisk.Caching $osDiskCaching;
+    Assert-AreEqual $p.StorageProfile.OsDisk.Name $osDiskName;
+    Assert-AreEqual $p.StorageProfile.OsDisk.Vhd.Uri $osDiskVhdUri;
     Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
     Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
     Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
     Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
-    Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
+    Assert-AreEqual $p.StorageProfile.DataDisks[0].Vhd.Uri $dataDiskVhdUri1;
     Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
     Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
     Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
-    Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
+    Assert-AreEqual $p.StorageProfile.DataDisks[1].Vhd.Uri $dataDiskVhdUri2;
 
     # OS & Image
     $user = "Foo12";
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionBasic.json b/src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionBasic.json
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionCantListSepcifyStorageAccountKey.json b/src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionCantListSepcifyStorageAccountKey.json
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionSepcifyStorageAccountName.json b/src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionSepcifyStorageAccountName.json
diff --git a/src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs b/src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs
@@ -33,14 +33,6 @@ public static class DiagnosticsHelper
         private static string StorageAccountKeyTag = "storageAccountKey";
         private static string StorageAccountEndPointTag = "storageAccountEndPoint";
 
-        public static string GetJsonSerializedPublicDiagnosticsConfigurationFromFile(string configurationPath,
-            string storageAccountName)
-        {
-            return
-                JsonConvert.SerializeObject(
-                    DiagnosticsHelper.GetPublicDiagnosticsConfigurationFromFile(configurationPath, storageAccountName));
-        }
-
         public static Hashtable GetPublicDiagnosticsConfigurationFromFile(string configurationPath, string storageAccountName)
         {
             using (StreamReader reader = new StreamReader(configurationPath))
@@ -107,12 +99,6 @@ public static Hashtable GetPublicDiagnosticsConfiguration(string config, string
             return hashTable;
         }
 
-        public static string GetJsonSerializedPrivateDiagnosticsConfiguration(string storageAccountName,
-            string storageKey, string endpoint)
-        {
-            return JsonConvert.SerializeObject(GetPrivateDiagnosticsConfiguration( storageAccountName, storageKey, endpoint));
-        }
-
         public static Hashtable GetPrivateDiagnosticsConfiguration(string storageAccountName, string storageKey, string endpoint)
         {
             var hashTable = new Hashtable();
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/SetAzureDiskEncryptionExtension.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/SetAzureDiskEncryptionExtension.cs
@@ -424,11 +424,11 @@ public override void ExecuteCmdlet()
 
                     VirtualMachineExtension parameters = GetVmExtensionParameters(virtualMachineResponse);
 
-                    this.VirtualMachineExtensionClient.CreateOrUpdate(
+                    this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
                         this.ResourceGroupName,
                         this.VMName,
                         this.Name,
-                        parameters);
+                        parameters).GetAwaiter().GetResult();
 
                     var op = UpdateVmEncryptionSettings();
                     var result = Mapper.Map<PSAzureOperationResponse>(op);
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/CustomScript/SetAzureVMCustomScriptExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/CustomScript/SetAzureVMCustomScriptExtensionCommand.cs
@@ -225,11 +225,11 @@ public override void ExecuteCmdlet()
 
                 try
                 {
-                    var op = this.VirtualMachineExtensionClient.CreateOrUpdate(
+                    var op = this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
                     this.ResourceGroupName,
                     this.VMName,
                     this.Name,
-                    parameters);
+                    parameters).GetAwaiter().GetResult();
                     var result = Mapper.Map<PSAzureOperationResponse>(op);
                     WriteObject(result);
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/SetAzureRmVMDiagnosticsExtension.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/SetAzureRmVMDiagnosticsExtension.cs
@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections;
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation;
@@ -40,8 +41,8 @@ namespace Microsoft.Azure.Commands.Compute
     [OutputType(typeof(PSAzureOperationResponse))]
     public class SetAzureRmVMDiagnosticsExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
-        private string publicConfiguration;
-        private string privateConfiguration;
+        private Hashtable publicConfiguration;
+        private Hashtable privateConfiguration;
         private string extensionName = "Microsoft.Insights.VMDiagnosticsSettings";
         private string location;
         private string version = "1.5";
@@ -179,29 +180,30 @@ public bool AutoUpgradeMinorVersion
             }
         }
 
-        private string PublicConfiguration
+        private Hashtable PublicConfiguration
         {
             get
             {
-                if (string.IsNullOrEmpty(this.publicConfiguration))
+                if (this.publicConfiguration == null)
                 {
                     this.publicConfiguration =
-                        DiagnosticsHelper.GetJsonSerializedPublicDiagnosticsConfigurationFromFile(
-                            this.DiagnosticsConfigurationPath, this.StorageAccountName);
+                        DiagnosticsHelper.GetPublicDiagnosticsConfigurationFromFile(this.DiagnosticsConfigurationPath,
+                            this.StorageAccountName);
                 }
 
                 return this.publicConfiguration;
             }
         }
 
-        private string PrivateConfiguration
+        private Hashtable PrivateConfiguration
         {
             get
             {
-                if (string.IsNullOrEmpty(this.privateConfiguration))
+                if (this.privateConfiguration == null)
                 {
-                    this.privateConfiguration = DiagnosticsHelper.GetJsonSerializedPrivateDiagnosticsConfiguration(this.StorageAccountName, this.StorageAccountKey,
-                            this.StorageAccountEndpoint);
+                    this.privateConfiguration = DiagnosticsHelper.GetPrivateDiagnosticsConfiguration(this.StorageAccountName,
+                        this.StorageAccountKey,
+                        this.StorageAccountEndpoint);
                 }
 
                 return this.privateConfiguration;
@@ -237,11 +239,11 @@ private void ExecuteCommand()
                     AutoUpgradeMinorVersion = this.AutoUpgradeMinorVersion
                 };
 
-                var op = this.VirtualMachineExtensionClient.CreateOrUpdate(
+                var op = this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
                     this.ResourceGroupName,
                     this.VMName,
                     this.Name,
-                    parameters);
+                    parameters).GetAwaiter().GetResult();
 
                 var result = Mapper.Map<PSAzureOperationResponse>(op);
                 WriteObject(result);
diff --git a/src/ResourceManager/Compute/Commands.Compute/RemoteDesktop/GetAzureRemoteDesktopFileCommand.cs b/src/ResourceManager/Compute/Commands.Compute/RemoteDesktop/GetAzureRemoteDesktopFileCommand.cs
@@ -89,7 +89,7 @@ public override void ExecuteCmdlet()
                 // Get Azure VM
                 var vmResponse = this.VirtualMachineClient.Get(this.ResourceGroupName, this.Name);
 
-                var nicId = vmResponse.VirtualMachine.NetworkProfile.NetworkInterfaces.First().ReferenceUri;
+                var nicId = vmResponse.NetworkProfile.NetworkInterfaces.First().Id;
 
                 // Get the NIC
                 var nicResourceGroupName = this.GetResourceGroupName(nicId);
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/GetAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/GetAzureVMCommand.cs
@@ -127,7 +127,7 @@ public override void ExecuteCmdlet()
                             foreach (var item in vmListResult.Body)
                             {
                                 var psItem = Mapper.Map<PSVirtualMachine>(item);
-                                psItem = Mapper.Map<Rest.Azure.AzureOperationResponse<IPage<VirtualMachine>>, PSVirtualMachine>(vmListResult, psItem);
+                                psItem = Mapper.Map(vmListResult, psItem);
                                 psResultList.Add(psItem);
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`	`15`	`using System;`
	`16`	`+using System.Collections;`
`16`	`17`	`using System.Globalization;`
`17`	`18`	`using System.Linq;`
`18`	`19`	`using System.Management.Automation;`
`@@ -40,8 +41,8 @@ namespace Microsoft.Azure.Commands.Compute`
`40`	`41`	`[OutputType(typeof(PSAzureOperationResponse))]`
`41`	`42`	`public class SetAzureRmVMDiagnosticsExtensionCommand : VirtualMachineExtensionBaseCmdlet`
`42`	`43`	`{`
`43`		`- private string publicConfiguration;`
`44`		`- private string privateConfiguration;`
	`44`	`+ private Hashtable publicConfiguration;`
	`45`	`+ private Hashtable privateConfiguration;`
`45`	`46`	`private string extensionName = "Microsoft.Insights.VMDiagnosticsSettings";`
`46`	`47`	`private string location;`
`47`	`48`	`private string version = "1.5";`
`@@ -179,29 +180,30 @@ public bool AutoUpgradeMinorVersion`
`179`	`180`	`}`
`180`	`181`	`}`
`181`	`182`
`182`		`- private string PublicConfiguration`
	`183`	`+ private Hashtable PublicConfiguration`
`183`	`184`	`{`
`184`	`185`	`get`
`185`	`186`	`{`
`186`		`- if (string.IsNullOrEmpty(this.publicConfiguration))`
	`187`	`+ if (this.publicConfiguration == null)`
`187`	`188`	`{`
`188`	`189`	`this.publicConfiguration =`
`189`		`- DiagnosticsHelper.GetJsonSerializedPublicDiagnosticsConfigurationFromFile(`
`190`		`- this.DiagnosticsConfigurationPath, this.StorageAccountName);`
	`190`	`+ DiagnosticsHelper.GetPublicDiagnosticsConfigurationFromFile(this.DiagnosticsConfigurationPath,`
	`191`	`+ this.StorageAccountName);`
`191`	`192`	`}`
`192`	`193`
`193`	`194`	`return this.publicConfiguration;`
`194`	`195`	`}`
`195`	`196`	`}`
`196`	`197`
`197`		`- private string PrivateConfiguration`
	`198`	`+ private Hashtable PrivateConfiguration`
`198`	`199`	`{`
`199`	`200`	`get`
`200`	`201`	`{`
`201`		`- if (string.IsNullOrEmpty(this.privateConfiguration))`
	`202`	`+ if (this.privateConfiguration == null)`
`202`	`203`	`{`
`203`		`- this.privateConfiguration = DiagnosticsHelper.GetJsonSerializedPrivateDiagnosticsConfiguration(this.StorageAccountName, this.StorageAccountKey,`
`204`		`- this.StorageAccountEndpoint);`
	`204`	`+ this.privateConfiguration = DiagnosticsHelper.GetPrivateDiagnosticsConfiguration(this.StorageAccountName,`
	`205`	`+ this.StorageAccountKey,`
	`206`	`+ this.StorageAccountEndpoint);`
`205`	`207`	`}`
`206`	`208`
`207`	`209`	`return this.privateConfiguration;`
`@@ -237,11 +239,11 @@ private void ExecuteCommand()`
`237`	`239`	`AutoUpgradeMinorVersion = this.AutoUpgradeMinorVersion`
`238`	`240`	`};`
`239`	`241`
`240`		`- var op = this.VirtualMachineExtensionClient.CreateOrUpdate(`
	`242`	`+ var op = this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(`
`241`	`243`	`this.ResourceGroupName,`
`242`	`244`	`this.VMName,`
`243`	`245`	`this.Name,`
`244`		`- parameters);`
	`246`	`+ parameters).GetAwaiter().GetResult();`
`245`	`247`
`246`	`248`	`var result = Mapper.Map<PSAzureOperationResponse>(op);`
`247`	`249`	`WriteObject(result);`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public override void ExecuteCmdlet()`
`127`	`127`	`foreach (var item in vmListResult.Body)`
`128`	`128`	`{`
`129`	`129`	`var psItem = Mapper.Map<PSVirtualMachine>(item);`
`130`		`- psItem = Mapper.Map<Rest.Azure.AzureOperationResponse<IPage<VirtualMachine>>, PSVirtualMachine>(vmListResult, psItem);`
	`130`	`+ psItem = Mapper.Map(vmListResult, psItem);`
`131`	`131`	`psResultList.Add(psItem);`
`132`	`132`	`}`
`133`	`133`	`}`