diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1 index 34dc5f71647a..12cfaa2d29f0 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1 +++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1 @@ -116,14 +116,14 @@ function Test-VirtualMachineExtension # Set extension settings by raw strings $settingstr = '{"fileUris":[],"commandToExecute":""}'; $protectedsettingstr = '{"storageAccountName":"' + $stoname + '","storageAccountKey":"' + $stokey + '"}'; - Set-AzureVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr; + Set-AzureVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr; # Get VM Extension $ext = Get-AzureVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname; Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-AreEqual $ext.Name $extname; Assert-AreEqual $ext.Publisher $publisher; - Assert-AreEqual $ext.Type $exttype; + Assert-AreEqual $ext.ExtensionType $exttype; Assert-AreEqual $ext.TypeHandlerVersion $extver; Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-NotNull $ext.ProvisioningState; @@ -132,7 +132,7 @@ function Test-VirtualMachineExtension Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-AreEqual $ext.Name $extname; Assert-AreEqual $ext.Publisher $publisher; - Assert-AreEqual $ext.Type $exttype; + Assert-AreEqual $ext.ExtensionType $exttype; Assert-AreEqual $ext.TypeHandlerVersion $extver; Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-NotNull $ext.ProvisioningState; @@ -141,14 +141,14 @@ function Test-VirtualMachineExtension # Set extension settings by hash table $settings = @{"fileUris" = "[]"; "commandToExecute" = ""}; $protectedsettings = @{"storageAccountName" = $stoname; "storageAccountKey" = $stokey}; - Set-AzureVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -Settings $settings -ProtectedSettings $protectedsettings; + Set-AzureVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -Settings $settings -ProtectedSettings $protectedsettings; # Get VM Extension $ext = Get-AzureVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname; Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-AreEqual $ext.Name $extname; Assert-AreEqual $ext.Publisher $publisher; - Assert-AreEqual $ext.Type $exttype; + Assert-AreEqual $ext.ExtensionType $exttype; Assert-AreEqual $ext.TypeHandlerVersion $extver; Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-NotNull $ext.ProvisioningState; @@ -157,7 +157,7 @@ function Test-VirtualMachineExtension Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-AreEqual $ext.Name $extname; Assert-AreEqual $ext.Publisher $publisher; - Assert-AreEqual $ext.Type $exttype; + Assert-AreEqual $ext.ExtensionType $exttype; Assert-AreEqual $ext.TypeHandlerVersion $extver; Assert-AreEqual $ext.ResourceGroupName $rgname; Assert-NotNull $ext.ProvisioningState; @@ -178,10 +178,10 @@ function Test-VirtualMachineExtension Assert-AreEqual $vm1.Resources.Extensions.Count 1; Assert-AreEqual $vm1.Resources.Extensions[0].Name $extname; Assert-AreEqual $vm1.Resources.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions'; - Assert-AreEqual $vm1.Resources.Extensions[0].VirtualMachineExtensionProperties.Publisher $publisher; - Assert-AreEqual $vm1.Resources.Extensions[0].VirtualMachineExtensionProperties.Type $exttype; - Assert-AreEqual $vm1.Resources.Extensions[0].VirtualMachineExtensionProperties.TypeHandlerVersion $extver; - Assert-NotNull $vm1.Resources.Extensions[0].VirtualMachineExtensionProperties.Settings; + Assert-AreEqual $vm1.Resources.Extensions[0].Publisher $publisher; + Assert-AreEqual $vm1.Resources.Extensions[0].ExtensionType $exttype; + Assert-AreEqual $vm1.Resources.Extensions[0].TypeHandlerVersion $extver; + Assert-NotNull $vm1.Resources.Extensions[0].Settings; <# *** TODO: The removal call did not return. 12/12/2014. diff --git a/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/NewAzureAvailabilitySetCommand.cs b/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/NewAzureAvailabilitySetCommand.cs index fca970b7fdcf..59b6fe3423cf 100644 --- a/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/NewAzureAvailabilitySetCommand.cs +++ b/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/NewAzureAvailabilitySetCommand.cs @@ -51,13 +51,10 @@ public override void ExecuteCmdlet() { base.ExecuteCmdlet(); - var avSetParams = new AvailabilitySetCreateOrUpdateParameters + var avSetParams = new AvailabilitySet { - AvailabilitySet = new AvailabilitySet - { - Name = this.Name, - Location = this.Location - } + Name = this.Name, + Location = this.Location }; var op = this.AvailabilitySetClient.CreateOrUpdate( diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs index f4aec0ad0b36..2cba0ad9a9d8 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs @@ -71,7 +71,7 @@ public class SetAzureVMExtensionCommand : VirtualMachineExtensionBaseCmdlet ValueFromPipelineByPropertyName = true, HelpMessage = "The type.")] [ValidateNotNullOrEmpty] - public string Type { get; set; } + public string ExtensionType { get; set; } [Alias("HandlerVersion", "Version")] [Parameter( @@ -131,22 +131,16 @@ public override void ExecuteCmdlet() this.ProtectedSettingString = new JsonSettingBuilder(this.ProtectedSettings).ToString(); } - var parameters = new VirtualMachineExtensionCreateOrUpdateParameters + var parameters = new VirtualMachineExtension { - VirtualMachineExtension = new VirtualMachineExtension - { - Location = this.Location, - Name = this.Name, - Type = VirtualMachineExtensionType, - VirtualMachineExtensionProperties = new VirtualMachineExtensionProperties - { - Publisher = this.Publisher, - Type = this.Type, - TypeHandlerVersion = this.TypeHandlerVersion, - Settings = this.SettingString, - ProtectedSettings = this.ProtectedSettingString - } - } + Location = this.Location, + Name = this.Name, + Type = VirtualMachineExtensionType, + Publisher = this.Publisher, + ExtensionType = this.ExtensionType, + TypeHandlerVersion = this.TypeHandlerVersion, + Settings = this.SettingString, + ProtectedSettings = this.ProtectedSettingString }; var op = this.VirtualMachineExtensionClient.CreateOrUpdate( diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/PSAvailabilitySet.cs b/src/ResourceManager/Compute/Commands.Compute/Models/PSAvailabilitySet.cs index 45147ffa139c..341efccc6236 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Models/PSAvailabilitySet.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Models/PSAvailabilitySet.cs @@ -59,10 +59,10 @@ public static PSAvailabilitySet ToPSAvailabilitySet(this AvailabilitySet avSet, Etag = null, // TODO: Update CRP library for this field Id = avSet.Id, Location = avSet.Location, - Statuses = avSet.Properties.Statuses, - PlatformFaultDomainCount = avSet.Properties == null ? null : avSet.Properties.PlatformFaultDomainCount, - PlatformUpdateDomainCount = avSet.Properties == null ? null : avSet.Properties.PlatformUpdateDomainCount, - VirtualMachines = avSet.Properties == null ? null : avSet.Properties.VirtualMachinesReferences + Statuses = avSet.Statuses, + PlatformFaultDomainCount = avSet == null ? null : avSet.PlatformFaultDomainCount, + PlatformUpdateDomainCount = avSet == null ? null : avSet.PlatformUpdateDomainCount, + VirtualMachines = avSet == null ? null : avSet.VirtualMachinesReferences }; return result; diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachine.cs b/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachine.cs index 36b1e5366975..29f9ac674b02 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachine.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachine.cs @@ -122,7 +122,8 @@ public IList NetworkInterfaces } } - public VirtualMachineSubResources Resources { get; set; } + public VirtualMachineChildResources Resources { get; set; } + public VirtualMachineInstanceView Status { get; set; } public HardwareProfile HardwareProfile { get; set; } @@ -153,22 +154,22 @@ public static PSVirtualMachine ToPSVirtualMachine(this VirtualMachine virtualMac ResourceGroupName = rgName, Name = virtualMachine == null ? null : virtualMachine.Name, Location = virtualMachine == null ? null : virtualMachine.Location, - ProvisioningState = virtualMachine.VirtualMachineProperties.ProvisioningState, + ProvisioningState = virtualMachine.ProvisioningState, Tags = virtualMachine.Tags, - Resources = virtualMachine.VirtualMachineSubResources, + Resources = virtualMachine.Resources, Status = null, // TODO: VM response does not return Status info yet }; - var asetRef = virtualMachine.VirtualMachineProperties.AvailabilitySetReference; + var asetRef = virtualMachine.AvailabilitySetReference; if (asetRef != null) { - result.AvailabilitySetId = virtualMachine.VirtualMachineProperties.AvailabilitySetReference.ReferenceUri; + result.AvailabilitySetId = virtualMachine.AvailabilitySetReference.ReferenceUri; } - result.OSProfile = virtualMachine.VirtualMachineProperties.OSProfile; - result.HardwareProfile = virtualMachine.VirtualMachineProperties.HardwareProfile; - result.StorageProfile = virtualMachine.VirtualMachineProperties.StorageProfile; - result.NetworkProfile = virtualMachine.VirtualMachineProperties.NetworkProfile; + result.OSProfile = virtualMachine.OSProfile; + result.HardwareProfile = virtualMachine.HardwareProfile; + result.StorageProfile = virtualMachine.StorageProfile; + result.NetworkProfile = virtualMachine.NetworkProfile; return result; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineExtension.cs b/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineExtension.cs index 9c0554f7d33b..280d9bdcdc90 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineExtension.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineExtension.cs @@ -29,7 +29,7 @@ public class PSVirtualMachineExtension public string Publisher { get; set; } - public string Type { get; set; } + public string ExtensionType { get; set; } public string TypeHandlerVersion { get; set; } @@ -62,13 +62,13 @@ public static PSVirtualMachineExtension ToPSVirtualMachineExtension(this Virtual Name = ext.Name, Location = ext.Location, Etag = null, // TODO: Update CRP library for this field - Publisher = ext.VirtualMachineExtensionProperties == null ? null : ext.VirtualMachineExtensionProperties.Publisher, - Type = ext.VirtualMachineExtensionProperties == null ? null : ext.VirtualMachineExtensionProperties.Type, - TypeHandlerVersion = ext.VirtualMachineExtensionProperties == null ? null : ext.VirtualMachineExtensionProperties.TypeHandlerVersion, + Publisher = ext == null ? null : ext.Publisher, + ExtensionType = ext == null ? null : ext.ExtensionType, + TypeHandlerVersion = ext == null ? null : ext.TypeHandlerVersion, Id = ext.Id, - Properties = ext.VirtualMachineExtensionProperties == null ? null : ext.VirtualMachineExtensionProperties.ProtectedSettings, - ProvisioningState = ext.VirtualMachineExtensionProperties == null ? null : ext.VirtualMachineExtensionProperties.ProvisioningState, - Statuses = ext.VirtualMachineExtensionProperties == null || ext.VirtualMachineExtensionProperties.InstanceView == null ? null : ext.VirtualMachineExtensionProperties.InstanceView.Statuses + Properties = ext == null ? null : ext.ProtectedSettings, + ProvisioningState = ext == null ? null : ext.ProvisioningState, + Statuses = ext == null || ext.InstanceView == null ? null : ext.InstanceView.Statuses }; return result; diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineInstanceView.cs b/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineInstanceView.cs index b1a017945d55..7e122f3a36ad 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineInstanceView.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineInstanceView.cs @@ -34,7 +34,7 @@ public class PSVirtualMachineInstanceView public string RemoteDesktopThumbprint { get; set; } - public VMAgentInstanceView VMAgent { get; set; } + public VirtualMachineAgentInstanceView VMAgent { get; set; } public IList Statuses { get; set; } } @@ -72,7 +72,7 @@ public static PSVirtualMachineInstanceView ToPSVirtualMachineInstanceView( return null; } - return response.VirtualMachineInstanceView.ToPSVirtualMachineInstanceView(resourceGroupName, vmName); + return response.InstanceView.ToPSVirtualMachineInstanceView(resourceGroupName, vmName); } } } diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs index 943ec887fa2d..f9932468b06f 100644 --- a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs +++ b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs @@ -43,7 +43,7 @@ public override void ExecuteCmdlet() if (this.Force.IsPresent || this.ShouldContinue(Resources.VirtualMachineStoppingConfirmation, Resources.VirtualMachineStoppingCaption)) { - Action> call = f => + Action> call = f => { var op = f(this.ResourceGroupName, this.Name); WriteObject(op); diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/SetAzureVMOSDiskCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/SetAzureVMOSDiskCommand.cs index 4d2455d772e2..28039b11ded0 100644 --- a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/SetAzureVMOSDiskCommand.cs +++ b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/SetAzureVMOSDiskCommand.cs @@ -93,7 +93,7 @@ public override void ExecuteCmdlet() { Caching = this.Caching, Name = this.Name, - OperatingSystemType = this.Windows.IsPresent ? OperatingSystemType.Windows : this.Linux.IsPresent ? OperatingSystemType.Linux : null, + OperatingSystemType = this.Windows.IsPresent ? OperatingSystemTypes.Windows : this.Linux.IsPresent ? OperatingSystemTypes.Linux : null, VirtualHardDisk = new VirtualHardDisk { Uri = this.VhdUri diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs index 7e61dd2c91e7..0e224e805baf 100644 --- a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs +++ b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs @@ -64,7 +64,7 @@ public override void ExecuteCmdlet() { base.ExecuteCmdlet(); - VirtualMachineProperties vmProps = new VirtualMachineProperties + var parameters = new VirtualMachine { HardwareProfile = this.VM.HardwareProfile, StorageProfile = this.VM.StorageProfile, @@ -74,17 +74,9 @@ public override void ExecuteCmdlet() : new AvailabilitySetReference { ReferenceUri = this.VM.AvailabilitySetId - } - }; - - var parameters = new VirtualMachineCreateOrUpdateParameters - { - VirtualMachine = new VirtualMachine - { - VirtualMachineProperties = vmProps, - Location = !string.IsNullOrEmpty(this.Location) ? this.Location : this.VM.Location, - Name = !string.IsNullOrEmpty(this.Name) ? this.Name : this.VM.Name - } + }, + Location = !string.IsNullOrEmpty(this.Location) ? this.Location : this.VM.Location, + Name = !string.IsNullOrEmpty(this.Name) ? this.Name : this.VM.Name }; var op = this.VirtualMachineClient.CreateOrUpdate(this.ResourceGroupName, parameters); diff --git a/src/lib/Microsoft.Azure.Management.Compute.dll b/src/lib/Microsoft.Azure.Management.Compute.dll index c3c0c104f7d8..8c0f3c86c0d9 100644 Binary files a/src/lib/Microsoft.Azure.Management.Compute.dll and b/src/lib/Microsoft.Azure.Management.Compute.dll differ