Merge branch 'dev' of https://github.com/Azure/azure-powershell.git into dev

Author: brooklyngw

ChangeLog.txt

@@ -1,3 +1,31 @@
+2015.05.29 version 0.9.2
+* Deprecated Switch-AzureMode
+* Profile
+    * Fixed bug in Get-AzureSubscription and Select-AzureSubscription cmdlets 
+* Added Automation cmdlets
+    * Get-AzureAutomationWebhook
+    * New-AzureAutomationWebhook
+    * Remove-AzureAutomationWebhook
+    * Set-AzureAutomationWebhook    
+* Azure Compute
+    * Get-AzureVMImage and Get-AzureVMImageDetail are combined (Get-AzureVMImageDetail gives a warning message for future deprecation)
+    * Get-AzureVMExtensionImage and Get-AzureVMExtensionImageDetail are combined (Get-AzureVMExtensionImageDetail gives a warning message for future deprecation)
+    * Tags are added in VM resources
+    * Get-AzureVM now gets resource group name from piping
+    * -All switch is removed from Get-AzureVM
+    * Get-AzureVM -Status output is updated
+    * -Force parameter is added for Remove-AzureAvailabilitySet
+    * Outputs of New-AzureAvailabilitySet, Get-AzureAvailabilitySet, and Remove-AzureAvailabilitySet are updated
+* Azure Key Vault 
+    * Update Set-AzureKeyVaultAccessPolicy and Remove-AzureKeyVaultAccessPolicy cmdlets
+    * Fixed bugs  
+* Azure Data Factories
+    * Base cmdlet type switch to use Profile
+    * New-AzureDataFactoryEncryptedValue cmdlet supporting M data sources
+* Azure Resource Manager 
+    * Fixed bug in Move-AzureResource cmdlet
+    * Fixed bug in Set-AzureResource cmdlet
+
 2015.05.04 version 0.9.1
 * Azure SQL Database: new support for configuring audit retention.
 * Azure Automation
@@ -332,7 +360,7 @@
     * Set-AzureVMCustomScriptExtension
     * Set-AzureVMAccessExtension
   * Show 'Regions' property for Get-AzureVMAvailableExtensions cmdlet
-  * Add 'ResizedSizeInGB' pramater for the following cmdlets
+  * Add 'ResizedSizeInGB' parameter for the following cmdlets
     * Update-AzureDisk
     * Set-AzureOSDisk
     * Set-AzureDataDisk (DiskName parameter is also added along with ResizedSizeInGB)
@@ -437,7 +465,7 @@
 * Compute
   * Set-AzureVMImage cmdlets - added IconUri, SmallIconUri, and ShowInGui parameters
 * Sql
-  *  Added Sql Servver v12 support to SQL authentication context for SqlAzure cmdlets
+  *  Added Sql Server v12 support to SQL authentication context for SqlAzure cmdlets
 
 2014.11.14 Version 0.8.11
 * Profile
@@ -760,7 +788,7 @@
         * Remove-AzureVMImageOSDiskConfig
         * Set-AzureVMImageDataDiskConfig
         * Remove-AzureVMImageDataDiskConfig
-    * Virtual network improvments
+    * Virtual network improvements
         * Set-AzureVnetGatewayKey
 * Azure Automation cmdlets
     * Get-AzureAutomationAccount

setup/azurecmd.wxs

@@ -5,7 +5,7 @@
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.9.1" ?>
+  <?define version="0.9.2" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>
 

setup/azurecmdfiles.wxi

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

src/Common/Commands.Common/AzurePowerShell.cs

@@ -1358,4 +1358,7 @@ use and privacy statement at <url> and (c) agree to sharing my contact inf
   <data name="AzureProfileMustNotBeNull" xml:space="preserve">
     <value>Selected profile must not be null.</value>
   </data>
+  <data name="SwitchAzureModeDeprecated" xml:space="preserve">
+    <value>The Switch-AzureMode cmdlet is deprecated and will be removed in a future release.</value>
+  </data>
 </root>

src/Common/Commands.Common/Properties/Resources.Designer.cs

@@ -14,6 +14,7 @@
 
 using System;
 using System.Management.Automation;
+using Microsoft.WindowsAzure.Commands.Common.Properties;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Microsoft.Azure.Common.Authentication;
 
@@ -34,6 +35,7 @@ public class SwitchAzureMode : AzurePSCmdlet
 
         public override void ExecuteCmdlet()
         {
+            WriteWarning(Resources.SwitchAzureModeDeprecated);
             AzureModule moduleToImport = (AzureModule)Enum.Parse(typeof(AzureModule), Name, false);
             AzureModule moduleToRemove = moduleToImport == AzureModule.AzureResourceManager ? AzureModule.AzureServiceManagement : AzureModule.AzureResourceManager;
             RemoveAzureModule(FileUtilities.GetModuleName(moduleToRemove), FileUtilities.GetPSModulePathForModule(moduleToRemove));

src/Common/Commands.Common/Properties/Resources.resx

@@ -203,6 +203,9 @@
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AutomationTests\TestAutomationSuspendAndResumeJob.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.AzureVMTests\TestGetAzureVM.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.SchedulerTests\TestSchedulerEndToEnd.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -284,10 +287,10 @@
     <Compile Include="Resources\ResourceLocator.cs" />
     <Compile Include="Scheduler\SchedulerTests.cs" />
     <Compile Include="ServiceBusTests\ServiceBusAuthorizationRuleTests.cs" />
+    <Compile Include="ServiceManagement\GetVMTests.cs" />
     <Compile Include="StorageTests\StorageContainerTest.cs" />
     <Compile Include="StorageTests\StorageContextTest.cs" />
     <Compile Include="StoreTests\StoreTests.cs" />
-    <Compile Include="ServiceManagement\VMProvisionScenarioTests.cs" />
     <Compile Include="TrafficManagerTests\TrafficManagerTests.cs" />
     <Compile Include="WAPackIaaS\CloudService\CmdletTestCloudServiceBase.cs" />
     <Compile Include="WAPackIaaS\CloudService\GetWAPackCloudServiceTests.cs" />
@@ -408,7 +411,7 @@
     <None Include="Resources\CloudService\Cache\mc.tgz">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\ServiceManagement\VMProvisionTests.ps1">
+    <None Include="Resources\ServiceManagement\AzureVMTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Resources\ServiceManagement\Common.ps1">

src/Common/Commands.Profile/SwitchAzureMode.cs

@@ -18,11 +18,30 @@
 .SYNOPSIS
 Tests Create-AzureVM with valid information.
 #>
-function Test-CreateWindowsAzureQuickVM
+function Test-GetAzureVM
 {
 	# Setup
+
 	$location = Get-DefaultLocation
+	$imgName = Get-DefaultImage $location
+
+
+	$storageName = getAssetName
+	New-AzureStorageAccount -StorageAccountName $storageName -Location $location
+
+	Set-CurrentStorageAccountName $storageName
+
+	$vmName = "vm1"
+	$svcName = Get-CloudServiceName
 
 	# Test
-	New-AzureQuickVM -Windows -ImageName $imageName -Name $newAzureQuickVMName -ServiceName $newAzureQuickVMSvcName -Password "p@ssw0rd" -Location $location
-}
+	New-AzureService -ServiceName $svcName -Location $location
+	New-AzureQuickVM -Windows -ImageName $imgName -Name $vmName -ServiceName $svcName -AdminUsername "pstestuser" -Password "p@ssw0rd"
+
+	Get-AzureVM -ServiceName $svcName -Name $vmName
+
+
+	# Cleanup
+	Cleanup-CloudService $svcName
+}
+

src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

@@ -12,11 +12,79 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+
 <#
 .SYNOPSIS
-Sets 
+Sets the default storage account
 #>
 function Set-CurrentStorageAccountName
 {
-	Get-AzureSubscription -Default | Set-AzureSubscription -CurrentStorageAccountName ""
-}
+    param([string] $storageAccountName)
+	$currentSubscription = Get-AzureSubscription -Current
+
+	Set-AzureSubscription -SubscriptionId $currentSubscription.SubscriptionId -CurrentStorageAccountName $storageAccountName
+}
+
+<#
+.SYNOPSIS
+Gets the default location
+#>
+function Get-DefaultLocation
+{
+	return (Get-AzureLocation)[0].Name
+}
+
+<#
+.SYNOPSIS
+Gets the default image
+#>
+function Get-DefaultImage
+{
+    param([string] $loc)
+	return (Get-AzureVMImage | where {$_.OS -eq "Windows"} | where {$_.Location.Contains($loc)})[0].ImageName
+}
+
+
+<#
+.SYNOPSIS
+Gets valid and available cloud service name.
+#>
+function Get-CloudServiceName
+{
+	return getAssetName
+}
+
+<#
+.SYNOPSIS
+Cleanup cloud service
+#>
+function Cleanup-CloudService
+{
+    param([string] $name)
+	try
+	{
+	     Remove-AzureService -ServiceName $name -Force
+	}
+	catch
+	{
+	     Write-Warning "Cannot Remove the Cloud Service"
+	}
+}
+
+<#
+.SYNOPSIS
+Cleanup storage
+#>
+function Cleanup-Storage
+{
+    param([string] $name)
+	Remove-AzureStorageAccount -StorageAccountName $name
+	try
+	{
+	     Remove-AzureStorageAccount -StorageAccountName $name
+	}
+	catch
+	{
+	     Write-Warning "Cannot Remove the Storage Account"
+	}
+}

src/Common/Commands.ScenarioTest/Resources/ServiceManagement/VMProvisionTests.ps1 renamed to src/Common/Commands.ScenarioTest/Resources/ServiceManagement/AzureVMTests.ps1

@@ -0,0 +1,63 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Common.Authentication;
+using Microsoft.Azure.Test;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.WindowsAzure.Commands.ScenarioTest
+{
+    public class AzureVMTests
+    {
+        private EnvironmentSetupHelper helper = new EnvironmentSetupHelper();
+
+        #region Get-AzureVM Scenario Tests
+
+        [Fact]
+        [Trait(Category.Service, Category.ServiceManagement)]
+        [Trait(Category.AcceptanceType, Category.LiveOnly)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void TestGetAzureVM()
+        {
+            this.RunPowerShellTest("Test-GetAzureVM");
+        }
+        #endregion
+
+        protected void SetupManagementClients()
+        {
+            helper.SetupSomeOfManagementClients();
+        }
+
+        protected void RunPowerShellTest(params string[] scripts)
+        {
+            using (UndoContext context = UndoContext.Current)
+            {
+                context.Start(TestUtilities.GetCallingClass(1), TestUtilities.GetCurrentMethodName(2));
+
+                SetupManagementClients();
+
+                List<string> modules = Directory.GetFiles("Resources\\ServiceManagement", "*.ps1").ToList();
+                modules.Add("Common.ps1");
+
+                helper.SetupEnvironment(AzureModule.AzureServiceManagement);
+                helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray());
+
+                helper.RunPowerShellTest(scripts);
+            }
+        }
+    }
+}