Merge pull request Azure#1030 from hovsepm/dev

Hovsep · Hovsep · commit 57e1fdc88c62 · 2015-10-01T16:04:15.000-07:00
[#104016000] Fixed Compute tests
diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs
@@ -58,8 +58,10 @@ public EnvironmentSetupHelper()
             rmprofile.Environments.Add("foo", AzureEnvironment.PublicEnvironments.Values.FirstOrDefault());
             rmprofile.Context = new AzureContext(new AzureSubscription(), new AzureAccount(), rmprofile.Environments["foo"], new AzureTenant());
             rmprofile.Context.Subscription.Environment = "foo";
-            AzureRMCmdlet.DefaultProfile = rmprofile;
-            AzureSession.DataStore = datastore;
+            if (AzureRMCmdlet.DefaultProfile == null)
+            {
+                AzureRMCmdlet.DefaultProfile = rmprofile;
+            }
             ProfileClient = new ProfileClient(profile);
 
             // Ignore SSL errors
@@ -162,12 +164,18 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
             environment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectory] = currentEnvironment.Endpoints.AADAuthUri.AbsoluteUri;
             environment.Endpoints[AzureEnvironment.Endpoint.Gallery] = currentEnvironment.Endpoints.GalleryUri.AbsoluteUri;
             environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;
+            environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = currentEnvironment.Endpoints.ResourceManagementUri.AbsoluteUri;
 
             if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
             {
                 ProfileClient.AddOrSetEnvironment(environment);
             }
 
+            if (!AzureRMCmdlet.DefaultProfile.Environments.ContainsKey(testEnvironmentName))
+            {
+                AzureRMCmdlet.DefaultProfile.Environments[testEnvironmentName] = environment;
+            }
+
             if (currentEnvironment.SubscriptionId != null)
             {
                 testSubscription = new AzureSubscription()
@@ -199,6 +207,17 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
                 ProfileClient.Profile.Subscriptions[testSubscription.Id] = testSubscription;
                 ProfileClient.Profile.Accounts[testAccount.Id] = testAccount;
                 ProfileClient.SetSubscriptionAsDefault(testSubscription.Name, testSubscription.Account);
+
+                var testTenant = new AzureTenant() { Id = Guid.NewGuid() };
+                if (!string.IsNullOrEmpty(currentEnvironment.Tenant))
+                {
+                    Guid tenant;
+                    if (Guid.TryParse(currentEnvironment.Tenant, out tenant))
+                    {
+                        testTenant.Id = tenant;
+                    }
+                }
+                AzureRMCmdlet.DefaultProfile.Context = new AzureContext(testSubscription, testAccount, environment, testTenant);
             }
         }
 
diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/PermissiveRecordMatcherWithApiExclusion.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/PermissiveRecordMatcherWithApiExclusion.cs
@@ -53,21 +53,24 @@ public string GetMatchingKey(System.Net.Http.HttpRequestMessage request)
         
         public string GetMatchingKey(RecordEntry recordEntry)
         {
-            var encodedPath = recordEntry.EncodedRequestUri;
-            if (recordEntry.RequestUri.Contains("?&"))
+            string path = recordEntry.RequestUri;
+            if(!string.IsNullOrEmpty(recordEntry.EncodedRequestUri))
             {
-                var updatedPath = recordEntry.RequestUri.Replace("?&", "?");
-
-
-                string version;
-                if (ContainsIgnoredProvider(updatedPath, out version))
-                {
-                    updatedPath = RemoveOrReplaceApiVersion(updatedPath, version);
-                }
+                path = Encoding.UTF8.GetString(Convert.FromBase64String(recordEntry.EncodedRequestUri));
+            }
 
-                encodedPath = Convert.ToBase64String(Encoding.UTF8.GetBytes(updatedPath));
+            if (path.Contains("?&"))
+            {
+                path = path.Replace("?&", "?");
             }
 
+            string version;
+            if (ContainsIgnoredProvider(path, out version))
+            {
+                path = RemoveOrReplaceApiVersion(path, version);
+            }
+            
+            var encodedPath = Convert.ToBase64String(Encoding.UTF8.GetBytes(path));
             return string.Format("{0} {1}", recordEntry.RequestMethod, encodedPath);
         }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs b/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs
@@ -97,7 +97,7 @@ public void RunPsTestWorkflow(
             string mockName)
         {
             Dictionary<string, string> d = new Dictionary<string, string>();
-            d.Add("Microsoft.Authorization", "2014-07-01-preview");
+            d.Add("Microsoft.Authorization", null);
             HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);
 
             using (UndoContext context = UndoContext.Current)
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DscExtensionTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DscExtensionTests.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
     public class DscExtensionTests
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAzureRmVMDscExtension()
         {
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.cs
@@ -19,14 +19,14 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
     public class VirtualMachineProfileTests
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineProfile()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineProfile");
         }
 
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineProfileWithoutAUC()
         {
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.ps1
@@ -116,7 +116,7 @@ function Test-VirtualMachineProfile
     $imgRef = Get-DefaultCRPWindowsImageOffline -loc $loc;
     $p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
 
-    $subid = (Get-AzureRmSubscription -Current).SubscriptionId;
+    $subid = (Get-AzureRmContext).Subscription.SubscriptionId;
 
     $referenceUri = "/subscriptions/" + $subid + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault123";
     $certStore = "My";
@@ -283,7 +283,7 @@ function Test-VirtualMachineProfileWithoutAUC
     $imgRef = Get-DefaultCRPWindowsImageOffline -loc $loc;
     $p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
 
-    $subid = (Get-AzureRmSubscription -Current).SubscriptionId;
+    $subid = (Get-AzureRmContext).Subscription.SubscriptionId;
 
     $referenceUri = "/subscriptions/" + $subid + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault123";
     $certStore = "My";
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
     public partial class VirtualMachineTests
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachine()
         {
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
@@ -179,7 +179,7 @@ function Test-VirtualMachine
         Assert-NotNull $aset;
         Assert-AreEqual $asetName $aset.Name;
 
-        $asetId = ('/subscriptions/' + (Get-AzureRmSubscription -Current).SubscriptionId + '/resourceGroups/' + $rgname + '/providers/Microsoft.Compute/availabilitySets/' + $asetName);
+        $asetId = ('/subscriptions/' + (Get-AzureRmContext).Subscription.SubscriptionId + '/resourceGroups/' + $rgname + '/providers/Microsoft.Compute/availabilitySets/' + $asetName);
         $vmname2 = $vmname + '2';
         $p2 = New-AzureRmVMConfig -VMName $vmname2 -VMSize $vmsize -AvailabilitySetId $asetId;
         $p2.HardwareProfile = $p.HardwareProfile;
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/Common.ps1 b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/Common.ps1
@@ -36,7 +36,7 @@ Gets a valid storage account resource id
 #>
 function Get-StorageResourceId($rgname, $resourcename)
 {
-    $subscription = (Get-AzureRmSubscription -Default).SubscriptionId
+    $subscription = (Get-AzureRmContext).Subscription.SubscriptionId
     return "/subscriptions/$subscription/resourcegroups/$rgname/providers/microsoft.storage/storageaccounts/$resourcename"
 }
 
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs
@@ -19,8 +19,10 @@
 using Microsoft.Azure.Management.Resources;
 using Microsoft.Azure.Subscriptions;
 using Microsoft.Azure.Test;
+using Microsoft.Azure.Test.HttpRecorder;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.OperationalInsights.Test
 {
@@ -51,6 +53,10 @@ protected void SetupManagementClients()
 
         protected void RunPowerShellTest(params string[] scripts)
         {
+            Dictionary<string, string> d = new Dictionary<string, string>();
+            d.Add("Microsoft.Authorization", null);
+            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);
+
             using (UndoContext context = UndoContext.Current)
             {
                 context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/StorageInsightTests.cs b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/StorageInsightTests.cs
@@ -19,14 +19,14 @@ namespace Microsoft.Azure.Commands.OperationalInsights.Test
 {
     public class StorageInsightTests : OperationalInsightsScenarioTestBase
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStorageInsightCreateUpdateDelete()
         {
             RunPowerShellTest("Test-StorageInsightCreateUpdateDelete");
         }
 
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStorageInsightCreateFailsWithoutWorkspace()
         {
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs
@@ -37,21 +37,21 @@ public void RaAuthorizationChangeLog()
            ResourcesController.NewInstance.RunPsTest("Test-RaAuthorizationChangeLog");
         }
 
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact(Skip = "Need to re-record test")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaClassicAdmins()
         {
             ResourcesController.NewInstance.RunPsTest("Test-RaClassicAdmins");
         }
 
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact(Skip = "Need to re-record test")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaNegativeScenarios()
         {
             ResourcesController.NewInstance.RunPsTest("Test-RaNegativeScenarios");
         }
 
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact(Skip = "Need to re-record test")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaByScope()
         {
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs
@@ -57,7 +57,7 @@ protected void RunPowerShellTest(params string[] scripts)
         {
             //HttpMockServer.Matcher = new PermissiveRecordMatcher();
             Dictionary<string, string> d = new Dictionary<string, string>();
-            d.Add("Microsoft.Authorization", "2014-07-01-preview");
+            d.Add("Microsoft.Authorization", null);
             HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);
             // Enable undo functionality as well as mock recording
             using (UndoContext context = UndoContext.Current)
diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/NewAzureProfileTests.cs b/src/ServiceManagement/Services/Commands.Test/Profile/NewAzureProfileTests.cs
@@ -56,7 +56,7 @@ public void TestMakeRdfeCallWithCreatedProfile()
             ProfileTestController.NewRdfeInstance.RunPSTestWithToken((context, token) => string.Format("Test-NewAzureProfileInRDFEMode {0} {1} {2}", token, context.Account.Id, context.Subscription.Id));
         }
 
-        [Fact(Skip = "Hovsep: Move to ARM")]
+        [Fact(Skip = "PSGet Migration: TODO Move to ARM")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestMakeArmCallWithCreatedProfile()
         {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void RunPsTestWorkflow(`
`97`	`97`	`string mockName)`
`98`	`98`	`{`
`99`	`99`	`Dictionary<string, string> d = new Dictionary<string, string>();`
`100`		`- d.Add("Microsoft.Authorization", "2014-07-01-preview");`
	`100`	`+ d.Add("Microsoft.Authorization", null);`
`101`	`101`	`HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);`
`102`	`102`
`103`	`103`	`using (UndoContext context = UndoContext.Current)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests`
`5`	`5`	`{`
`6`	`6`	`public class DscExtensionTests`
`7`	`7`	`{`
`8`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`8`	`+ [Fact]`
`9`	`9`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`10`	`10`	`public void TestGetAzureRmVMDscExtension()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests`
`19`	`19`	`{`
`20`	`20`	`public class VirtualMachineProfileTests`
`21`	`21`	`{`
`22`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`22`	`+ [Fact]`
`23`	`23`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`24`	`24`	`public void TestVirtualMachineProfile()`
`25`	`25`	`{`
`26`	`26`	`ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineProfile");`
`27`	`27`	`}`
`28`	`28`
`29`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`29`	`+ [Fact]`
`30`	`30`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`31`	`31`	`public void TestVirtualMachineProfileWithoutAUC()`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests`
`19`	`19`	`{`
`20`	`20`	`public partial class VirtualMachineTests`
`21`	`21`	`{`
`22`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`22`	`+ [Fact]`
`23`	`23`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`24`	`24`	`public void TestVirtualMachine()`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ Gets a valid storage account resource id`
`36`	`36`	`#>`
`37`	`37`	`function Get-StorageResourceId($rgname, $resourcename)`
`38`	`38`	`{`
`39`		`- $subscription = (Get-AzureRmSubscription -Default).SubscriptionId`
	`39`	`+ $subscription = (Get-AzureRmContext).Subscription.SubscriptionId`
`40`	`40`	`return "/subscriptions/$subscription/resourcegroups/$rgname/providers/microsoft.storage/storageaccounts/$resourcename"`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,10 @@`
`19`	`19`	`using Microsoft.Azure.Management.Resources;`
`20`	`20`	`using Microsoft.Azure.Subscriptions;`
`21`	`21`	`using Microsoft.Azure.Test;`
	`22`	`+using Microsoft.Azure.Test.HttpRecorder;`
`22`	`23`	`using Microsoft.WindowsAzure.Commands.ScenarioTest;`
`23`	`24`	`using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;`
	`25`	`+using System.Collections.Generic;`
`24`	`26`
`25`	`27`	`namespace Microsoft.Azure.Commands.OperationalInsights.Test`
`26`	`28`	`{`
`@@ -51,6 +53,10 @@ protected void SetupManagementClients()`
`51`	`53`
`52`	`54`	`protected void RunPowerShellTest(params string[] scripts)`
`53`	`55`	`{`
	`56`	`+ Dictionary<string, string> d = new Dictionary<string, string>();`
	`57`	`+ d.Add("Microsoft.Authorization", null);`
	`58`	`+ HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);`
	`59`	`+`
`54`	`60`	`using (UndoContext context = UndoContext.Current)`
`55`	`61`	`{`
`56`	`62`	`context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));`
Original file line number	Diff line number	Diff line change
`@@ -37,21 +37,21 @@ public void RaAuthorizationChangeLog()`
`37`	`37`	`ResourcesController.NewInstance.RunPsTest("Test-RaAuthorizationChangeLog");`
`38`	`38`	`}`
`39`	`39`
`40`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`40`	`+ [Fact(Skip = "Need to re-record test")]`
`41`	`41`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`42`	`42`	`public void RaClassicAdmins()`
`43`	`43`	`{`
`44`	`44`	`ResourcesController.NewInstance.RunPsTest("Test-RaClassicAdmins");`
`45`	`45`	`}`
`46`	`46`
`47`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`47`	`+ [Fact(Skip = "Need to re-record test")]`
`48`	`48`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`49`	`49`	`public void RaNegativeScenarios()`
`50`	`50`	`{`
`51`	`51`	`ResourcesController.NewInstance.RunPsTest("Test-RaNegativeScenarios");`
`52`	`52`	`}`
`53`	`53`
`54`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`54`	`+ [Fact(Skip = "Need to re-record test")]`
`55`	`55`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`56`	`56`	`public void RaByScope()`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected void RunPowerShellTest(params string[] scripts)`
`57`	`57`	`{`
`58`	`58`	`//HttpMockServer.Matcher = new PermissiveRecordMatcher();`
`59`	`59`	`Dictionary<string, string> d = new Dictionary<string, string>();`
`60`		`- d.Add("Microsoft.Authorization", "2014-07-01-preview");`
	`60`	`+ d.Add("Microsoft.Authorization", null);`
`61`	`61`	`HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);`
`62`	`62`	`// Enable undo functionality as well as mock recording`
`63`	`63`	`using (UndoContext context = UndoContext.Current)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public void TestMakeRdfeCallWithCreatedProfile()`
`56`	`56`	`ProfileTestController.NewRdfeInstance.RunPSTestWithToken((context, token) => string.Format("Test-NewAzureProfileInRDFEMode {0} {1} {2}", token, context.Account.Id, context.Subscription.Id));`
`57`	`57`	`}`
`58`	`58`
`59`		`- [Fact(Skip = "Hovsep: Move to ARM")]`
	`59`	`+ [Fact(Skip = "PSGet Migration: TODO Move to ARM")]`
`60`	`60`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`61`	`61`	`public void TestMakeArmCallWithCreatedProfile()`
`62`	`62`	`{`