resolve merge conflicts

Author: deepakswifty

ChangeLog.txt

@@ -60,6 +60,15 @@
     * Remove-AzureNetworkSecurityRuleConfig
     * Add-AzureNetworkSecurityRuleConfig
     * Set-AzureNetworkSecurityRuleConfig
+* Azure Storage
+  * Added cmdlets in AzureResourceManager Mode
+    * New-AzureStorageAccount
+    * Get-AzureStorageAccount
+    * Set-AzureStorageAccount
+    * Remove-AzureStorageAccount
+    * New-AzureStorageAccountKey
+    * Get-AzureStorageAccountKey
+  * Made Azure Storage data cmdlets work in AzureResourceManager Mode
 
 2015.04.28 version 0.8.17
 * Azure Batch
@@ -68,6 +77,25 @@
     * Remove-AzureBatchVMUser
     * Get-AzureBatchRDPFile
     * Get-AzureBatchVMFileContents
+* StorSimple: New StorSimple commands in AzureServiceManagement mode
+  * Added cmdlets
+    * Confirm-AzureStorSimpleLegacyVolumeContainerStatus
+    * Get-AzureStorSimpleLegacyVolumeContainerConfirmStatus
+    * Get-AzureStorSimpleLegacyVolumeContainerMigrationPlan
+    * Get-AzureStorSimpleLegacyVolumeContainerStatus
+    * Import-AzureStorSimpleLegacyApplianceConfig
+    * Import-AzureStorSimpleLegacyVolumeContainer
+    * Start-AzureStorSimpleLegacyVolumeContainerMigrationPlan
+    * New-AzureStorSimpleVirtualDeviceCommand
+    * Get-AzureStorSimpleJob
+    * Stop-AzureStorSimpleJob
+    * Start-AzureStorSimpleBackupCloneJob
+    * Get-AzureStorSimpleFailoverVolumeContainers
+    * Start-AzureStorSimpleDeviceFailoverJob
+    * New-AzureStorSimpleNetworkConfig
+    * Set-AzureStorSimpleDevice
+    * Set-AzureStorSimpleVirtualDevice
+
 
 2015.03.31 version 0.8.16
 * Azure Data Factory:
@@ -139,9 +167,9 @@
   * Set-AzureRemoteAppWorkspace
   * Unpublish-AzureRemoteAppProgram
   * Update-AzureRemoteAppCollection
-  
+
 * Storage: new cmdlets
-  * Get-AzureStorageContainerStoredAccessPolicy 
+  * Get-AzureStorageContainerStoredAccessPolicy
   * Get-AzureStorageQueueStoredAccessPolicy
   * Get-AzureStorageTableStoredAccessPolicy
   * New-AzureStorageContainerStoredAccessPolicy
@@ -185,7 +213,7 @@
     * Start-AzureSiteRecoveryCommitFailoverJob
     * Start-AzureSiteRecoveryPlannedFailoverJob
     * Start-AzureSiteRecoveryTestFailoverJob
-    
+
 * Azure ExpressRoute cmdlet updates
   * Fixed bugs in:
     * New-AzureDedicatedCircuit
@@ -198,12 +226,12 @@
     * Update-AzureDedicatedCircuitBandwidth
 
 * Azure SQL Database: new cmdlets for managing database dynamic data masking policies:
-  * Get-AzureSqlDatabaseDataMaskingPolicy 
-  * Set-AzureSqlDatabaseDataMaskingPolicy 
-  * New-AzureSqlDatabaseDataMaskingRule 
-  * Get-AzureSqlDatabaseDataMaskingRule 
-  * Set-AzureSqlDatabaseDataMaskingRule 
-  * Remove-AzureSqlDatabaseDataMaskingRule 
+  * Get-AzureSqlDatabaseDataMaskingPolicy
+  * Set-AzureSqlDatabaseDataMaskingPolicy
+  * New-AzureSqlDatabaseDataMaskingRule
+  * Get-AzureSqlDatabaseDataMaskingRule
+  * Set-AzureSqlDatabaseDataMaskingRule
+  * Remove-AzureSqlDatabaseDataMaskingRule
 
 * Azure Batch: new cmdlets:
   * Get-AzureBatchPool
@@ -221,22 +249,22 @@
     * Update-AzureDisk
     * Set-AzureOSDisk
     * Set-AzureDataDisk (DiskName parameter is also added along with ResizedSizeInGB)
-    
-* AzureProfile: 
+
+* AzureProfile:
   * New cmdlets to manage in-memory profiles
     * New-AzureProfile: Create a new in-memory Profile
     * Select-AzureProfile: Select the profile to be used in the current session
   * Added -Profile parameter to every cmdlet - the cmdlet will use the passed-in profile to authenticate with Azure
-  
+
 2015.02.12 version 0.8.14
 * StorSimple: New StorSimple commands in AzureServiceManagement mode:
   * GetAzureStorSimpleAccessControlRecord
   * GetAzureStorSimpleStorageAccountCredential
   * RemoveAzureStorSimpleAccessControlRecord
   * RemoveAzureStorSimpleStorageAccountCredential
   * SetAzureStorSimpleAccessControlRecord
-  * GetAzureStorSimpleDeviceVolume 
-  * RemoveAzureStorSimpleDeviceVolume 
+  * GetAzureStorSimpleDeviceVolume
+  * RemoveAzureStorSimpleDeviceVolume
   * GetAzureStorSimpleDeviceVolumeContainer
   * RemoveAzureStorSimpleDeviceVolumeContainer
   * GetAzureStorSimpleDevice
@@ -268,19 +296,19 @@
   * ClusterType (update): New value (Spark) can be specified as cluster type
   * Add-AzureHDInsightConfigValues cmdlet:
     * Spark (new): collection of configuration properties can be passed in to customize the Spark service
-    
+
  * Azure Insights cmdlets in AzureResourceManager Mode:
    * Get-AzureCrrelationLogId
    * Get-AzureResourceGroupLog
    * Get-AzureResourceLog
    * Get-AzureResourceProviderLog
    * Get-AzureSubscriptionIdLog
-   
+
 * Azure VM cmdlets
   * Get-AzureVMDscExtentionStatus: Get the DSC Extension status for a cloud service or VM
-  
+
  * Updates and bug fixes for AzureAutomation and AzureDataFactory cmdlets
- 
+
 2015.01.08 version 0.8.13
 * Key Vault Service - new cmdlets in AzureResourceManager mode:
   * Keys:
@@ -362,7 +390,7 @@
     * Remove-AzureSqlDatabaseServerAuditing
     * Use-AzureSqlDatabaseServerAuditingPolicy
   * Allow users to define which storage account key (Primary or Secondary) to use when defining audit policy, using the “StorageKeyType” parameter.
-  
+
 2014.10.27 Version 0.8.10
 * Azure Data Factory cmdlets in AzureResourceManager mode
     * New-AzureDataFactory

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define productName="Microsoft Azure PowerShell - March 2015" ?>
+  <?define productName="Microsoft Azure PowerShell - April 2015" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.8.16.1" ?>
+  <?define version="0.9.0" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>
 

src/Common/Commands.Common/AzurePowerShell.cs

@@ -27,9 +27,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "0.8.16.1";
+        public const string AssemblyVersion = "0.9.0";
 
-        public const string AssemblyFileVersion = "0.8.16.1";
+        public const string AssemblyFileVersion = "0.9.0";
 
         public const string ProfileFile = "AzureProfile.json";
 

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

@@ -66,17 +66,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Compute, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.4.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.Compute, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.5.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.3.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -148,11 +148,14 @@
     <Compile Include="ScenarioTests\StorageAccountTests.cs" />
     <Compile Include="ScenarioTests\TestVirtualMachineImageList.cs" />
     <Compile Include="ScenarioTests\TestVirtualMachineList.cs" />
+    <Compile Include="ScenarioTests\VirtualMachineDataDiskTests.cs" />
+    <Compile Include="ScenarioTests\VirtualMachineCaptureTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineProfileTests.cs" />
     <Compile Include="ScenarioTests\AvailabilitySetTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineExtensionTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineNetworkInterfaceTests.cs" />
     <Compile Include="ScenarioTests\TestVirtualMachineSizeAndUsage.cs" />
+    <Compile Include="ScenarioTests\VirtualMachinePIRv2Tests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineTests.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -246,6 +249,12 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestStorageAccount.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineAccessExtension.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineCustomScriptExtension.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineExtension.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -264,12 +273,21 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineProfileTests\TestVirtualMachineProfile.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineDataDisk.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineImageList.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineList.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineCapture.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachinePIRv2.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineSizeAndUsage.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

@@ -83,3 +83,131 @@ function Retry-IfException
 
     $ErrorActionPreference = $oldErrorActionPreferenceValue;
 }
+
+<#
+.SYNOPSIS
+Gets random resource name
+#>
+function Get-RandomItemName
+{
+    param([string] $prefix = "pslibtest")
+    
+    if ($prefix -eq $null -or $prefix -eq '')
+    {
+        $prefix = "pslibtest";
+    }
+
+    $str = $prefix + ((Get-Random) % 10000);
+    return $str;
+}
+
+<#
+.SYNOPSIS
+Gets default VM size string
+#>
+function Get-DefaultVMSize
+{
+    param([string] $location = "eastasia")
+
+    $vmSizes = Get-AzureVMSize -Location $location | where { $_.NumberOfCores -ge 4 -and $_.MaxDataDiskCount -ge 8 };
+
+    foreach ($sz in $vmSizes)
+    {
+        if ($sz.Name -eq 'Standard_A3')
+        {
+            return $sz.Name;
+        }
+    }
+
+    return $vmSizes[0].Name;
+}
+
+<#
+.SYNOPSIS
+Gets default RDFE Image
+#>
+function Get-DefaultRDFEImage
+{
+    param([string] $loca = "East Asia", [string] $query = '*Windows*Data*Center*')
+
+    $d = (Azure\Get-AzureVMImage | where {$_.ImageName -like $query -and ($_.Location -like "*;$loca;*" -or $_.Location -like "$loca;*" -or $_.Location -like "*;$loca" -or $_.Location -eq "$loca")});
+
+    if ($d -eq $null)
+    {
+        return $null;
+    }
+    else
+    {
+        return $d[-1].ImageName;
+    }
+}
+
+<#
+.SYNOPSIS
+Gets default RDFE Image
+#>
+function Get-DefaultCRPImage
+{
+    param([string] $loc = "eastasia", [string] $query = '*Microsoft*Windows*Server')
+
+    $result = (Get-AzureVMImagePublisher -Location $loc) | select -ExpandProperty PublisherName | where { $_ -like $query };
+    if ($result.Count -eq 1)
+    {
+        $defaultPublisher = $result;
+    }
+    else
+    {
+        $defaultPublisher = $result[0];
+    }
+
+    $result = (Get-AzureVMImageOffer -Location $loc -PublisherName $defaultPublisher) | select -ExpandProperty Offer | where { $_ -like '*Windows*' };
+    if ($result.Count -eq 1)
+    {
+        $defaultOffer = $result;
+    }
+    else
+    {
+        $defaultOffer = $result[0];
+    }
+
+    $result = (Get-AzureVMImageSku -Location $loc -PublisherName $defaultPublisher -Offer $defaultOffer) | select -ExpandProperty Skus;
+    if ($result.Count -eq 1)
+    {
+        $defaultSku = $result;
+    }
+    else
+    {
+        $defaultSku = $result[0];
+    }
+
+    $result = (Get-AzureVMImageVersion -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku) | select -ExpandProperty Version;
+    if ($result.Count -eq 1)
+    {
+        $defaultVersion = $result;
+    }
+    else
+    {
+        $defaultVersion = $result[0];
+    }
+    
+    $vmimg = Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion;
+
+    return $vmimg;
+}
+
+<#
+.SYNOPSIS
+Gets default VM config object
+#>
+function Get-DefaultVMConfig
+{
+    param([string] $location = "eastasia")
+
+    # VM Profile & Hardware
+    $vmsize = Get-DefaultVMSize $location;
+    $vmname = Get-RandomItemName 'pstestvm';
+
+    $vm = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
+
+    return $vm;
+}