diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs index 1d4d64192a15..0114142e422b 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs @@ -87,7 +87,7 @@ public void CreateVMAccessExtensionTest() VerifyRDPExtension(vmName, serviceName); // Disbale extesnion - DisableExtension(vmName, serviceName); + DisableExtension(vmName, serviceName, "1.*"); ValidateVMAccessExtension(vmName, serviceName, false); pass = true; @@ -301,11 +301,11 @@ private void VerifyRDPExtension(string vmName, string serviceName) Console.WriteLine("Azure VM RDP file downloaded."); } - private void DisableExtension(string vmName, string serviceName) + private void DisableExtension(string vmName, string serviceName, string ver = "2.0") { var vm = GetAzureVM(vmName, serviceName); Console.WriteLine("Disabling the VM Access extesnion for the vm {0}",vmName); - vm = vmPowershellCmdlets.SetAzureVMAccessExtension(vm, disable:true, version:"2.0", forceUpdate:true); + vm = vmPowershellCmdlets.SetAzureVMAccessExtension(vm, disable:true, version:ver, forceUpdate:true); vmPowershellCmdlets.UpdateAzureVM(vmName, serviceName, vm); Console.WriteLine("Disabled VM Access extesnion for the vm {0}", vmName); } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs index b9190545fa73..fac881f21ecc 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs @@ -12,21 +12,13 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Management.Automation; -using System.Net; -using System.Security.Cryptography.X509Certificates; -using System.Xml; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.Profile.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; using Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions; +using Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Gateway.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo; @@ -34,18 +26,24 @@ using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extensions.BGInfo; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extensions.Common; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extesnions.CustomScript; -using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extesnions.VMAccess; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extensions.SqlServer; +using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extesnions.VMAccess; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.ILB; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PaasCmdletInfo; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PIRCmdletInfo; -using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PowershellCore; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.NetworkCmdletInfo; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.SubscriptionCmdletInfo; using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Gateway.Model; using Microsoft.WindowsAzure.Management.Network.Models; using Microsoft.WindowsAzure.Storage.Blob; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Management.Automation; +using System.Net; +using System.Security.Cryptography.X509Certificates; +using System.Xml; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests { @@ -1857,26 +1855,11 @@ public void RemoveAzureSubscription(string Name, bool force, bool debug = false) removeAzureSubscriptionCmdlet.Run(debug); } - public List GetAzureEnvironment(string name = null, string subscriptionDataFile = null, bool debug = false) + public List GetAzureEnvironment(string name = null, string subscriptionDataFile = null, bool debug = false) { - Collection result = (new WindowsAzurePowershellCmdlet(new GetAzureEnvironmentCmdletInfo(name, subscriptionDataFile))).Run(debug); - List envList = new List(); - - foreach (var element in result) - { - var newEnv = new AzureEnvironment(); - newEnv.Name = element.Properties.Match("Name")[0].Value.ToString(); - var endpoints = new Dictionary(); - var endpointKeys = Enum.GetValues(typeof(AzureEnvironment.Endpoint)); - foreach(var key in endpointKeys) - { - endpoints.Add((AzureEnvironment.Endpoint) key, (string) element.Properties.Match(key.ToString())[0].Value); - } - - newEnv.Endpoints = endpoints; - envList.Add(newEnv); - } - + var envList = new List(); + RunPSCmdletAndReturnAll(new GetAzureEnvironmentCmdletInfo(name, subscriptionDataFile)) + .ForEach(a => envList.Add(a)); return envList; } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs index 8c052ce0f80c..c0d4e43ced9b 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs @@ -180,33 +180,33 @@ public static void SetTestSettings() CredentialHelper.GetTestSettings(Resource.TestSettings); vmPowershellCmdlets.RemoveAzureSubscriptions(); - if (vmPowershellCmdlets.GetAzureEnvironment("ussouth").Count > 0) + var ussouthEnv = vmPowershellCmdlets.GetAzureEnvironment("ussouth"); + if (ussouthEnv != null && ussouthEnv.Count > 0) { Console.WriteLine("Removing ussouth environment..."); vmPowershellCmdlets.RunPSScript("Remove-AzureEnvironment -Name ussouth -Force"); } - List environments = vmPowershellCmdlets.GetAzureEnvironment(); + List environments = vmPowershellCmdlets.GetAzureEnvironment(); var serviceManagementUrl = GetServiceManagementUrl(CredentialHelper.PublishSettingsFile); foreach (var env in environments) { - var envServiceManagementUrl = (string) env.Endpoints[AzureEnvironment.Endpoint.ServiceManagement]; - if (!string.IsNullOrEmpty(envServiceManagementUrl)) + if (!string.IsNullOrEmpty(env.ServiceManagementUrl)) { - if (envServiceManagementUrl.Equals(serviceManagementUrl)) + if (env.ServiceManagementUrl.Equals(serviceManagementUrl)) { currentEnvName = env.Name; var curEnv = vmPowershellCmdlets.GetAzureEnvironment(currentEnvName)[0]; Console.WriteLine("Using the existing environment: {0}", currentEnvName); - Console.WriteLine("PublichSettingsFileUrl: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.PublishSettingsFileUrl)); - Console.WriteLine("ServiceManagement: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ServiceManagement)); - Console.WriteLine("ManagementPortalUrl: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ManagementPortalUrl)); - Console.WriteLine("ActiveDirectory: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectory)); - Console.WriteLine("ActiveDirectoryServiceEndpointResourceId: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId)); - Console.WriteLine("ResourceManager: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ResourceManager)); - Console.WriteLine("Gallery: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.Gallery)); - Console.WriteLine("Graph: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.Graph)); + Console.WriteLine("PublichSettingsFileUrl: {0}", curEnv.PublishSettingsFileUrl); + Console.WriteLine("ServiceManagement: {0}", curEnv.ServiceManagementUrl); + Console.WriteLine("ManagementPortalUrl: {0}", curEnv.ManagementPortalUrl); + Console.WriteLine("ActiveDirectory: {0}", curEnv.ActiveDirectoryAuthority); + Console.WriteLine("ActiveDirectoryServiceEndpointResourceId: {0}", curEnv.ActiveDirectoryServiceEndpointResourceId); + Console.WriteLine("ResourceManager: {0}", curEnv.ResourceManagerUrl); + Console.WriteLine("Gallery: {0}", curEnv.GalleryUrl); + Console.WriteLine("Graph: {0}", curEnv.GalleryUrl); break; } } @@ -227,14 +227,14 @@ public static void SetTestSettings() -GalleryEndpoint {7} ` -GraphEndpoint {8}", TempEnvName, - prodEnv.GetEndpoint(AzureEnvironment.Endpoint.PublishSettingsFileUrl), + prodEnv.PublishSettingsFileUrl, serviceManagementUrl, - prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ManagementPortalUrl), - prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectory), - prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId), - prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ResourceManager), - prodEnv.GetEndpoint(AzureEnvironment.Endpoint.Gallery), - prodEnv.GetEndpoint(AzureEnvironment.Endpoint.Graph))); + prodEnv.ManagementPortalUrl, + prodEnv.ActiveDirectoryAuthority, + prodEnv.ActiveDirectoryServiceEndpointResourceId, + prodEnv.ResourceManagerUrl, + prodEnv.GalleryUrl, + prodEnv.GalleryUrl)); vmPowershellCmdlets.ImportAzurePublishSettingsFile(CredentialHelper.PublishSettingsFile, TempEnvName); }