Merge pull request AzureRT#36 from Azure/dev

PR from parent
hyonholee · Aug 29, 2015 · 1364ab7 · 1364ab7
2 parents ea5e7d8 + e9b4b17
commit 1364ab7
Show file tree

Hide file tree

Showing 53 changed files with 55,195 additions and 5,451 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,23 @@
 ## 2015.09.03 version 0.9.8
 * Azure Compute (ARM) Cmdlets
 	* Add -Launch parameter for Get-AzureRemoteDesktopFile cmdlet
+* Azure Backup - added the following cmdlets
+  * Backup-AzureRMBackupItem
+  * Register-AzureRMBackupContainer
+  * Disable-AzureRMBackupProtection
+  * Enable-AzureRMBackupProtection
+  * Get-AzureRMBackupItem
+  * Get-AzureRMBackupJob
+  * Get-AzureRMBackupJobDetails
+  * Stop-AzureRMBackupJob
+  * Wait-AzureRMBackupJob
+  * Get-AzureRMBackupProtectionPolicy
+  * New-AzureRMBackupProtectionPolicy
+  * New-AzureRMBackupRetentionPolicyObject
+  * Remove-AzureRMBackupProtectionPolicy
+  * Set-AzureRMBackupProtectionPolicy
+  * Get-AzureRMBackupRecoveryPoint
+  * Restore-AzureRMBackupItem
 
 ## 2015.08.17 version 0.9.7
 * Azure Profile cmdlets
@@ -31,23 +48,6 @@
   * Added Restart-AzureRemoteAppVm cmdlet
 * Azure HDInsight cmdlets
   * Added cmdlet help
-* Azure Backup - added the following cmdlets
-  * Backup-AzureRMBackupItem
-  * Register-AzureRMBackupContainer
-  * Disable-AzureRMBackupProtection
-  * Enable-AzureRMBackupProtection
-  * Get-AzureRMBackupItem
-  * Get-AzureRMBackupJob
-  * Get-AzureRMBackupJobDetails
-  * Stop-AzureRMBackupJob
-  * Wait-AzureRMBackupJob
-  * Get-AzureRMBackupProtectionPolicy
-  * New-AzureRMBackupProtectionPolicy
-  * New-AzureRMBackupRetentionPolicyObject
-  * Remove-AzureRMBackupProtectionPolicy
-  * Set-AzureRMBackupProtectionPolicy
-  * Get-AzureRMBackupRecoveryPoint
-  * Restore-AzureRMBackupItem
 
 ## 2015.08.07 version 0.9.6
 * Azure Batch cmdlets

diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
@@ -2077,6 +2077,9 @@
                         <Component Id="cmp55FEE041CC305952FE17E655815CE51A" Guid="*">
                             <File Id="fil14F4B8C7E95C606DDDE47BE166D9F241" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.format.ps1xml" />
                         </Component>
+                        <Component Id="cmpF23457BA331434DDB0815F84746FD1E7" Guid="*">
+                            <File Id="fil1972DDA29C9A5FC7D61122B5F5E1D84B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml" />
+                        </Component>
                         <Component Id="cmp057F4C8C0E8E8DB3E57FD8B64885B30F" Guid="*">
                             <File Id="fil17C8016A3D5AA097BE35FB83C7539AB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Tags.dll" />
                         </Component>
@@ -5475,6 +5478,7 @@
             <ComponentRef Id="cmp56F52674BB946225BB64533814DCF37F" />
             <ComponentRef Id="cmp499092B04619C0EDE4686B78E1128605" />
             <ComponentRef Id="cmp55FEE041CC305952FE17E655815CE51A" />
+            <ComponentRef Id="cmpF23457BA331434DDB0815F84746FD1E7" />
             <ComponentRef Id="cmp057F4C8C0E8E8DB3E57FD8B64885B30F" />
             <ComponentRef Id="cmpC6D3C91080AD47682B7959EF9DF193D3" />
             <ComponentRef Id="cmpD7CC32C127B6074C2D5CA20EAA1B14A0" />

diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj
@@ -64,6 +64,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Azure.Insights">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.7.7-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Azure.KeyVault.Core">
+      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Azure.Management.Authorization, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
@@ -467,6 +473,9 @@
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestSetAResourceTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+	<None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests\RaAuthorizationChangeLog.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests\RaByResource.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs
@@ -22,6 +22,7 @@
 using Microsoft.Azure.Common.Authentication;
 using Microsoft.Azure.Gallery;
 using Microsoft.Azure.Graph.RBAC;
+using Microsoft.Azure.Insights;
 using Microsoft.Azure.Management.Authorization;
 using Microsoft.Azure.Management.Resources;
 using Microsoft.Azure.Subscriptions;
@@ -47,6 +48,8 @@ public sealed class ResourcesController
         public SubscriptionClient SubscriptionClient { get; private set; }
 
         public GalleryClient GalleryClient { get; private set; }
+
+        public InsightsClient InsightsClient { get; private set; }
 
         // TODO: http://vstfrd:8080/Azure/RD/_workitems#_a=edit&id=3247094
         //public EventsClient EventsClient { get; private set; }
@@ -111,7 +114,8 @@ public void RunPsTestWorkflow(
                 helper.SetupModules(
                     AzureModule.AzureResourceManager, 
                     "ScenarioTests\\Common.ps1",
-                    "ScenarioTests\\" + callingClassName + ".ps1");
+                    "ScenarioTests\\" + callingClassName + ".ps1",
+                    "ResourceManagerStartup.ps1");
 
                 try
                 {
@@ -142,6 +146,7 @@ private void SetupManagementClients()
             GalleryClient = GetGalleryClient();
             AuthorizationManagementClient = GetAuthorizationManagementClient();
             GraphClient = GetGraphClient();
+            InsightsClient = GetInsightsClient();
             this.FeatureClient = this.GetFeatureClient();
             HttpClientHelperFactory.Instance = new TestHttpClientHelperFactory(this.csmTestFactory.GetTestEnvironment().Credentials as SubscriptionCloudCredentials);
 
@@ -150,6 +155,7 @@ private void SetupManagementClients()
                 GalleryClient,
                 AuthorizationManagementClient,
                 GraphClient,
+                InsightsClient,
                 this.FeatureClient);
         }
 
@@ -206,6 +212,11 @@ private GalleryClient GetGalleryClient()
             return TestBase.GetServiceClient<GalleryClient>(this.csmTestFactory);
         }
 
+        private InsightsClient GetInsightsClient()
+        {
+            return TestBase.GetServiceClient<InsightsClient>(this.csmTestFactory);
+        }
+
         /// <summary>
         /// The test http client helper factory.
         /// </summary>

diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs
@@ -16,22 +16,26 @@
 using Microsoft.Azure.Graph.RBAC;
 using Microsoft.Azure.Graph.RBAC.Models;
 using Microsoft.Azure.Management.Authorization;
-using Microsoft.Azure.Management.Authorization.Models;
 using Microsoft.Azure.Management.Resources;
 using Microsoft.Azure.Management.Resources.Models;
-using Microsoft.Azure.Test.HttpRecorder;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.Azure.Test;
 using System;
 using System.Linq;
-using System.Threading;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
     public class RoleAssignmentTests
     {
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void RaAuthorizationChangeLog()
+        {
+           ResourcesController.NewInstance.RunPsTest("Test-RaAuthorizationChangeLog");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaNegativeScenarios()

diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.ps1 b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.ps1
@@ -232,6 +232,20 @@ function Test-RaUserPermissions
 	Assert-AreEqual	$action $permissions.Permissions[0].Actions[0] "Permission action mismatch." 
 }
 
+<#
+.SYNOPSIS
+Tests verifies Get-AzureAuthorizationChangeLog
+#>
+function Test-RaAuthorizationChangeLog
+{
+	$log1 = Get-AzureAuthorizationChangeLog -startTime 2015-08-27 -EndTime 2015-08-27T22:30:00Z
+
+	# Assert
+	Assert-True { $log1.Count -ge 1 } "At least one record should be returned for the user"
+}
+
+
+
 <#
 .SYNOPSIS
 Creates role assignment

diff --git a/...e.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests/RaAuthorizationChangeLog.json b/...e.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests/RaAuthorizationChangeLog.json
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config
@@ -6,6 +6,8 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Insights" version="0.7.7-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5687.28567-prerelease" targetFramework="net45" />

diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
@@ -55,7 +55,8 @@ ScriptsToProcess = @()
 
 # Type files (.ps1xml) to be loaded when importing this module  
 TypesToProcess = @(  
-    '.\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml'  
+    '.\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml',
+    '.\Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml' 
 )  
 
 # Format files (.ps1xml) to be loaded when importing this module