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

Author: vladca

ChangeLog.txt

@@ -142,12 +142,6 @@
         * Get-AzureSqlDatabaseRestorePoints
     * Changed cmdlets:
         * New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
-* Azure Recovery Services
-    * Fixed Storage and Network mapping issues
-    * Added encryption support for failover changes
-    * Added Delete vault support
-    * Provisioned to update VM properties
-    * Few bug fixes
 
 2015.06.05 version 0.9.3
 * Fixed bug in Websites cmdlets related to slots #454

setup/azurecmdfiles.wxi

@@ -3086,9 +3086,6 @@
                         <Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
                             <File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
                         </Component>
-                        <Component Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" Guid="*">
-                            <File Id="fil91A18D6C24D483473C8F08BC5DCED268" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.format.ps1xml" />
-                        </Component>
                         <Component Id="cmpF2406A263F1B403C803ACB70D2468624" Guid="*">
                             <File Id="fil2AB9A3CCA503D5D983784642C1F8E4F4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
                         </Component>
@@ -5051,7 +5048,6 @@
             <ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
             <ComponentRef Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" />
             <ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
-            <ComponentRef Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" />
             <ComponentRef Id="cmpF2406A263F1B403C803ACB70D2468624" />
             <ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
             <ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />

src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

@@ -123,10 +123,6 @@ function Run-StartAndStopMultipleVirtualMachinesTest
         Start-AzureVM -ServiceName $svcName -VM $vmList[0];
         Start-AzureVM -ServiceName $svcName -VM $vmList[0],$vmList[1];
         Start-AzureVM -ServiceName $svcName -VM $vmList;
-    }
-    catch
-    {
-
     }
     finally
     {

src/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/RunStartAndStopMultipleVirtualMachinesTest.json

@@ -294,7 +294,9 @@ public static void SetTestSettings()
 
         protected void StartTest(string testname, DateTime testStartTime)
         {
-            Console.WriteLine("{0} test starts at {1}", testname, testStartTime);
+            string subId = defaultAzureSubscription.SubscriptionId;
+            string endPoint = defaultAzureSubscription.ServiceEndpoint;
+            Console.WriteLine("{0} test starts at {1} for subscription {2} and endpoint {3}", testname, testStartTime, subId, endPoint);
         }
 
         private static void Retry(string cmdlet, string message, int maxTry = 1, int intervalSecond = 10)

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs

@@ -34,7 +34,7 @@ public class StartAzureVMCommand : IaaSDeploymentManagementCmdletBase
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The Virtual Machine to restart.", ParameterSetName = "Input")]
         [ValidateNotNullOrEmpty]
         [Alias("InputObject")]
-        public PersistentVM[] VM { get; set; }
+        public IPersistentVM[] VM { get; set; }
 
         protected override void ExecuteCommand()
         {
@@ -47,7 +47,7 @@ protected override void ExecuteCommand()
                 return;
             }
 
-            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.RoleName).ToArray();
+            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.GetInstance().RoleName).ToArray();
 
             // Generate a list of role names matching wildcard patterns or
             // the exact name specified in the -Name parameter.

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/StartAzureVM.cs

@@ -36,7 +36,7 @@ public class StopAzureVMCommand : IaaSDeploymentManagementCmdletBase
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The Virtual Machine to restart.", ParameterSetName = "Input")]
         [ValidateNotNullOrEmpty]
         [Alias("InputObject")]
-        public Model.PersistentVM[] VM { get; set; }
+        public Model.IPersistentVM[] VM { get; set; }
 
         [Parameter(Position = 2, HelpMessage = "Keeps the VM provisioned")]
         public SwitchParameter StayProvisioned { get; set; }
@@ -54,7 +54,7 @@ protected override void ExecuteCommand()
                 return;
             }
 
-            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.RoleName).ToArray();
+            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.GetInstance().RoleName).ToArray();
 
             // Generate a list of role names matching regular expressions or
             // the exact name specified in the -Name parameter.

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/StopAzureVM.cs

@@ -81,8 +81,9 @@
     <Reference Include="Microsoft.WindowsAzure.Management">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.6.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.1-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -91,9 +92,6 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="SiteRecovery.Tests">
-      <HintPath>..\Commands.RecoveryServices\lib\SiteRecovery.Tests.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj

@@ -155,11 +155,5 @@ public void CommitRPTest()
         {
             this.RunPowerShellTest("Test-CommitRP -vaultSettingsFilePath \"" + vaultSettingsFilePath + "\"");
         }
-
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void RecoveryServicesSanE2ETest()
-        {
-            this.RunPowerShellTest("Test-SanE2E -vaultSettingsFilePath \"" + vaultSettingsFilePath + "\"");
-        }
     }
 }