Skip to content

Commit f03cb79

Browse files
AzureRTAzureRT
committed
Merge pull request #32 from AzureRT/dev
Fix test setups
2 parents 698d2b8 + 7d53bd9 commit f03cb79

File tree

3 files changed

+38
-55
lines changed

3 files changed

+38
-55
lines changed

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void CreateVMAccessExtensionTest()
8787
VerifyRDPExtension(vmName, serviceName);
8888

8989
// Disbale extesnion
90-
DisableExtension(vmName, serviceName);
90+
DisableExtension(vmName, serviceName, "1.*");
9191
ValidateVMAccessExtension(vmName, serviceName, false);
9292
pass = true;
9393

@@ -301,11 +301,11 @@ private void VerifyRDPExtension(string vmName, string serviceName)
301301
Console.WriteLine("Azure VM RDP file downloaded.");
302302
}
303303

304-
private void DisableExtension(string vmName, string serviceName)
304+
private void DisableExtension(string vmName, string serviceName, string ver = "2.0")
305305
{
306306
var vm = GetAzureVM(vmName, serviceName);
307307
Console.WriteLine("Disabling the VM Access extesnion for the vm {0}",vmName);
308-
vm = vmPowershellCmdlets.SetAzureVMAccessExtension(vm, disable:true, version:"2.0", forceUpdate:true);
308+
vm = vmPowershellCmdlets.SetAzureVMAccessExtension(vm, disable:true, version:ver, forceUpdate:true);
309309
vmPowershellCmdlets.UpdateAzureVM(vmName, serviceName, vm);
310310
Console.WriteLine("Disabled VM Access extesnion for the vm {0}", vmName);
311311
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,38 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
16-
using System.Collections;
17-
using System.Collections.Generic;
18-
using System.Collections.ObjectModel;
19-
using System.IO;
20-
using System.Management.Automation;
21-
using System.Net;
22-
using System.Security.Cryptography.X509Certificates;
23-
using System.Xml;
24-
using Microsoft.VisualStudio.TestTools.UnitTesting;
2515
using Microsoft.Azure.Common.Authentication.Models;
16+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2617
using Microsoft.WindowsAzure.Commands.Common.Storage;
2718
using Microsoft.WindowsAzure.Commands.Profile.Models;
2819
using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions;
2920
using Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions;
21+
using Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Gateway.Model;
3022
using Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.Model;
3123
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo;
3224
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo;
3325
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.DiskRepository;
3426
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extensions.BGInfo;
3527
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extensions.Common;
3628
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extesnions.CustomScript;
37-
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extesnions.VMAccess;
3829
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extensions.SqlServer;
30+
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.Extesnions.VMAccess;
3931
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo.ILB;
4032
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PaasCmdletInfo;
4133
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PIRCmdletInfo;
42-
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PowershellCore;
4334
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.NetworkCmdletInfo;
4435
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.SubscriptionCmdletInfo;
4536
using Microsoft.WindowsAzure.Commands.Utilities.Common;
46-
using Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Gateway.Model;
4737
using Microsoft.WindowsAzure.Management.Network.Models;
4838
using Microsoft.WindowsAzure.Storage.Blob;
39+
using System;
40+
using System.Collections.Generic;
41+
using System.Collections.ObjectModel;
42+
using System.IO;
43+
using System.Management.Automation;
44+
using System.Net;
45+
using System.Security.Cryptography.X509Certificates;
46+
using System.Xml;
4947

5048
namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
5149
{
@@ -1857,26 +1855,11 @@ public void RemoveAzureSubscription(string Name, bool force, bool debug = false)
18571855
removeAzureSubscriptionCmdlet.Run(debug);
18581856
}
18591857

1860-
public List<AzureEnvironment> GetAzureEnvironment(string name = null, string subscriptionDataFile = null, bool debug = false)
1858+
public List<PSAzureEnvironment> GetAzureEnvironment(string name = null, string subscriptionDataFile = null, bool debug = false)
18611859
{
1862-
Collection<PSObject> result = (new WindowsAzurePowershellCmdlet(new GetAzureEnvironmentCmdletInfo(name, subscriptionDataFile))).Run(debug);
1863-
List<AzureEnvironment> envList = new List<AzureEnvironment>();
1864-
1865-
foreach (var element in result)
1866-
{
1867-
var newEnv = new AzureEnvironment();
1868-
newEnv.Name = element.Properties.Match("Name")[0].Value.ToString();
1869-
var endpoints = new Dictionary<AzureEnvironment.Endpoint,string>();
1870-
var endpointKeys = Enum.GetValues(typeof(AzureEnvironment.Endpoint));
1871-
foreach(var key in endpointKeys)
1872-
{
1873-
endpoints.Add((AzureEnvironment.Endpoint) key, (string) element.Properties.Match(key.ToString())[0].Value);
1874-
}
1875-
1876-
newEnv.Endpoints = endpoints;
1877-
envList.Add(newEnv);
1878-
}
1879-
1860+
var envList = new List<PSAzureEnvironment>();
1861+
RunPSCmdletAndReturnAll<PSAzureEnvironment>(new GetAzureEnvironmentCmdletInfo(name, subscriptionDataFile))
1862+
.ForEach(a => envList.Add(a));
18801863
return envList;
18811864
}
18821865

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -180,33 +180,33 @@ public static void SetTestSettings()
180180
CredentialHelper.GetTestSettings(Resource.TestSettings);
181181

182182
vmPowershellCmdlets.RemoveAzureSubscriptions();
183-
if (vmPowershellCmdlets.GetAzureEnvironment("ussouth").Count > 0)
183+
var ussouthEnv = vmPowershellCmdlets.GetAzureEnvironment("ussouth");
184+
if (ussouthEnv != null && ussouthEnv.Count > 0)
184185
{
185186
Console.WriteLine("Removing ussouth environment...");
186187
vmPowershellCmdlets.RunPSScript("Remove-AzureEnvironment -Name ussouth -Force");
187188
}
188189

189-
List<AzureEnvironment> environments = vmPowershellCmdlets.GetAzureEnvironment();
190+
List<PSAzureEnvironment> environments = vmPowershellCmdlets.GetAzureEnvironment();
190191
var serviceManagementUrl = GetServiceManagementUrl(CredentialHelper.PublishSettingsFile);
191192

192193
foreach (var env in environments)
193194
{
194-
var envServiceManagementUrl = (string) env.Endpoints[AzureEnvironment.Endpoint.ServiceManagement];
195-
if (!string.IsNullOrEmpty(envServiceManagementUrl))
195+
if (!string.IsNullOrEmpty(env.ServiceManagementUrl))
196196
{
197-
if (envServiceManagementUrl.Equals(serviceManagementUrl))
197+
if (env.ServiceManagementUrl.Equals(serviceManagementUrl))
198198
{
199199
currentEnvName = env.Name;
200200
var curEnv = vmPowershellCmdlets.GetAzureEnvironment(currentEnvName)[0];
201201
Console.WriteLine("Using the existing environment: {0}", currentEnvName);
202-
Console.WriteLine("PublichSettingsFileUrl: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.PublishSettingsFileUrl));
203-
Console.WriteLine("ServiceManagement: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ServiceManagement));
204-
Console.WriteLine("ManagementPortalUrl: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ManagementPortalUrl));
205-
Console.WriteLine("ActiveDirectory: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectory));
206-
Console.WriteLine("ActiveDirectoryServiceEndpointResourceId: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId));
207-
Console.WriteLine("ResourceManager: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.ResourceManager));
208-
Console.WriteLine("Gallery: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.Gallery));
209-
Console.WriteLine("Graph: {0}", curEnv.GetEndpoint(AzureEnvironment.Endpoint.Graph));
202+
Console.WriteLine("PublichSettingsFileUrl: {0}", curEnv.PublishSettingsFileUrl);
203+
Console.WriteLine("ServiceManagement: {0}", curEnv.ServiceManagementUrl);
204+
Console.WriteLine("ManagementPortalUrl: {0}", curEnv.ManagementPortalUrl);
205+
Console.WriteLine("ActiveDirectory: {0}", curEnv.ActiveDirectoryAuthority);
206+
Console.WriteLine("ActiveDirectoryServiceEndpointResourceId: {0}", curEnv.ActiveDirectoryServiceEndpointResourceId);
207+
Console.WriteLine("ResourceManager: {0}", curEnv.ResourceManagerUrl);
208+
Console.WriteLine("Gallery: {0}", curEnv.GalleryUrl);
209+
Console.WriteLine("Graph: {0}", curEnv.GalleryUrl);
210210
break;
211211
}
212212
}
@@ -227,14 +227,14 @@ public static void SetTestSettings()
227227
-GalleryEndpoint {7} `
228228
-GraphEndpoint {8}",
229229
TempEnvName,
230-
prodEnv.GetEndpoint(AzureEnvironment.Endpoint.PublishSettingsFileUrl),
230+
prodEnv.PublishSettingsFileUrl,
231231
serviceManagementUrl,
232-
prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ManagementPortalUrl),
233-
prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectory),
234-
prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId),
235-
prodEnv.GetEndpoint(AzureEnvironment.Endpoint.ResourceManager),
236-
prodEnv.GetEndpoint(AzureEnvironment.Endpoint.Gallery),
237-
prodEnv.GetEndpoint(AzureEnvironment.Endpoint.Graph)));
232+
prodEnv.ManagementPortalUrl,
233+
prodEnv.ActiveDirectoryAuthority,
234+
prodEnv.ActiveDirectoryServiceEndpointResourceId,
235+
prodEnv.ResourceManagerUrl,
236+
prodEnv.GalleryUrl,
237+
prodEnv.GalleryUrl));
238238

239239
vmPowershellCmdlets.ImportAzurePublishSettingsFile(CredentialHelper.PublishSettingsFile, TempEnvName);
240240
}

0 commit comments

Comments
 (0)