Skip to content

Commit d43c029

Browse files
sharwellsharwell
committed
Merge pull request #231 from sharwell/CloudServersTesting
Cloud servers testing
2 parents ea7d492 + 80a92c5 commit d43c029

7 files changed

Lines changed: 161 additions & 150 deletions

File tree

‎src/testing/integration/Bootstrapper.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using System.IO;
33
using System.Text;
44
using net.openstack.Core.Domain;
5+
using net.openstack.Core.Providers;
6+
using net.openstack.Providers.Rackspace;
57
using net.openstack.Providers.Rackspace.Objects;
68

79
namespace Net.OpenStack.Testing.Integration
@@ -45,6 +47,36 @@ public static void Initialize()
4547

4648
_settings = appCredentials;
4749
}
50+
51+
public static IIdentityProvider CreateIdentityProvider()
52+
{
53+
return CreateIdentityProvider(Bootstrapper.Settings.TestIdentity);
54+
}
55+
56+
public static IIdentityProvider CreateIdentityProvider(CloudIdentity identity)
57+
{
58+
return new CloudIdentityProvider(identity);
59+
}
60+
61+
public static IComputeProvider CreateComputeProvider()
62+
{
63+
return new CloudServersProvider(Bootstrapper.Settings.TestIdentity, Bootstrapper.Settings.DefaultRegion, null, null);
64+
}
65+
66+
public static INetworksProvider CreateNetworksProvider()
67+
{
68+
return new CloudNetworksProvider(Bootstrapper.Settings.TestIdentity, Bootstrapper.Settings.DefaultRegion, null, null);
69+
}
70+
71+
public static IBlockStorageProvider CreateBlockStorageProvider()
72+
{
73+
return new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity, Bootstrapper.Settings.DefaultRegion, null, null);
74+
}
75+
76+
public static IObjectStorageProvider CreateObjectStorageProvider()
77+
{
78+
return new CloudFilesProvider(Bootstrapper.Settings.TestIdentity, Bootstrapper.Settings.DefaultRegion, null, null);
79+
}
4880
}
4981

5082
public class OpenstackNetSetings
@@ -56,6 +88,12 @@ public class OpenstackNetSetings
5688
public ExtendedCloudIdentity TestDomainIdentity { get; set; }
5789

5890
public string RackspaceExtendedIdentityUrl { get; set; }
91+
92+
public string DefaultRegion
93+
{
94+
get;
95+
set;
96+
}
5997
}
6098

6199
public class ExtendedCloudIdentity : CloudIdentity

‎src/testing/integration/Providers/Rackspace/UserBlockStorageTests.cs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ public class UserBlockStorageTests
4141
#region Volume
4242

4343
[TestMethod]
44-
[TestCategory(TestCategories.User)]
45-
[TestCategory(TestCategories.BlockStorage)]
4644
[TestCategory(TestCategories.Cleanup)]
4745
public void CleanupTestVolumes()
4846
{
49-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
47+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
5048
IEnumerable<Volume> volumes = provider.ListVolumes();
5149
foreach (Volume volume in volumes)
5250
{
@@ -66,7 +64,7 @@ public void CleanupTestVolumes()
6664
[TestCategory(TestCategories.BlockStorage)]
6765
public void TestListVolumes()
6866
{
69-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
67+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
7068
IEnumerable<Volume> volumes = provider.ListVolumes();
7169
Assert.IsNotNull(volumes);
7270
if (!volumes.Any())
@@ -86,7 +84,7 @@ public void TestListVolumes()
8684
[TestCategory(TestCategories.BlockStorage)]
8785
public void TestBasicVolumeFeatures()
8886
{
89-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
87+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
9088
string displayName = UnitTestVolumePrefix + Path.GetRandomFileName();
9189
Volume result = provider.CreateVolume(MinimumVolumeSize, displayName: displayName);
9290
Assert.IsNotNull(result);
@@ -129,7 +127,7 @@ public void TestBasicVolumeFeatures()
129127
[TestCategory(TestCategories.BlockStorage)]
130128
public void TestShowVolume()
131129
{
132-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
130+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
133131
IEnumerable<Volume> volumes = provider.ListVolumes();
134132
Assert.IsNotNull(volumes);
135133
if (!volumes.Any())
@@ -158,7 +156,7 @@ public void TestShowVolume()
158156
[TestCategory(TestCategories.BlockStorage)]
159157
public void TestListVolumeTypes()
160158
{
161-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
159+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
162160
IEnumerable<VolumeType> volumeTypes = provider.ListVolumeTypes();
163161
Assert.IsNotNull(volumeTypes);
164162
if (!volumeTypes.Any())
@@ -177,7 +175,7 @@ public void TestListVolumeTypes()
177175
[TestCategory(TestCategories.BlockStorage)]
178176
public void TestDescribeVolumeType()
179177
{
180-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
178+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
181179
IEnumerable<VolumeType> volumeTypes = provider.ListVolumeTypes();
182180
Assert.IsNotNull(volumeTypes);
183181
if (!volumeTypes.Any())
@@ -199,12 +197,10 @@ public void TestDescribeVolumeType()
199197
#region Snapshot
200198

201199
[TestMethod]
202-
[TestCategory(TestCategories.User)]
203-
[TestCategory(TestCategories.BlockStorage)]
204200
[TestCategory(TestCategories.Cleanup)]
205201
public void CleanupTestSnapshots()
206202
{
207-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
203+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
208204
IEnumerable<Snapshot> snapshots = provider.ListSnapshots();
209205
foreach (Snapshot snapshot in snapshots)
210206
{
@@ -224,7 +220,7 @@ public void CleanupTestSnapshots()
224220
[TestCategory(TestCategories.BlockStorage)]
225221
public void TestListSnapshots()
226222
{
227-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
223+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
228224
IEnumerable<Snapshot> snapshots = provider.ListSnapshots();
229225
Assert.IsNotNull(snapshots);
230226
if (!snapshots.Any())
@@ -244,7 +240,7 @@ public void TestListSnapshots()
244240
[TestCategory(TestCategories.BlockStorage)]
245241
public void TestBasicSnapshotFeatures()
246242
{
247-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
243+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
248244

249245
//
250246
// Volume setup...
@@ -336,7 +332,7 @@ public static VolumeType GetSsdVolumeTypeOrDefault(IBlockStorageProvider provide
336332
[TestCategory(TestCategories.BlockStorage)]
337333
public void TestShowSnapshot()
338334
{
339-
IBlockStorageProvider provider = new CloudBlockStorageProvider(Bootstrapper.Settings.TestIdentity);
335+
IBlockStorageProvider provider = Bootstrapper.CreateBlockStorageProvider();
340336
IEnumerable<Snapshot> snapshots = provider.ListSnapshots();
341337
Assert.IsNotNull(snapshots);
342338
if (!snapshots.Any())

‎src/testing/integration/Providers/Rackspace/UserComputeTests.cs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,11 @@ public static IEnumerable<FlavorDetails> ListAllFlavorsWithDetails(IComputeProvi
158158
}
159159

160160
[TestMethod]
161-
[TestCategory(TestCategories.User)]
162-
[TestCategory(TestCategories.Compute)]
163161
[TestCategory(TestCategories.Cleanup)]
164162
public void CleanupTestServers()
165163
{
166-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
167-
IEnumerable<SimpleServer> servers = ListAllServers(provider);
164+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
165+
IEnumerable<SimpleServer> servers = ListAllServers(provider).ToArray();
168166
foreach (SimpleServer server in servers)
169167
{
170168
if (string.IsNullOrEmpty(server.Name))
@@ -181,13 +179,11 @@ public void CleanupTestServers()
181179
}
182180

183181
[TestMethod]
184-
[TestCategory(TestCategories.User)]
185-
[TestCategory(TestCategories.Compute)]
186182
[TestCategory(TestCategories.Cleanup)]
187183
public void CleanupTestImages()
188184
{
189-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
190-
IEnumerable<SimpleServerImage> images = ListAllImages(provider);
185+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
186+
IEnumerable<SimpleServerImage> images = ListAllImages(provider).ToArray();
191187
foreach (SimpleServerImage image in images)
192188
{
193189
if (string.IsNullOrEmpty(image.Name))
@@ -204,8 +200,6 @@ public void CleanupTestImages()
204200
}
205201

206202
[TestMethod]
207-
[TestCategory(TestCategories.User)]
208-
[TestCategory(TestCategories.Compute)]
209203
[TestCategory(TestCategories.Cleanup)]
210204
public void CleanupTestVirtualInterfaces()
211205
{
@@ -218,7 +212,7 @@ public void CleanupTestVirtualInterfaces()
218212
[TestCategory(TestCategories.Compute)]
219213
public void TestListFlavors()
220214
{
221-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
215+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
222216
IEnumerable<Flavor> flavors = ListAllFlavors(provider);
223217
Assert.IsNotNull(flavors);
224218
if (!flavors.Any())
@@ -241,7 +235,7 @@ public void TestListFlavors()
241235
[TestCategory(TestCategories.Compute)]
242236
public void TestListFlavorsWithDetails()
243237
{
244-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
238+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
245239
IEnumerable<FlavorDetails> flavors = ListAllFlavorsWithDetails(provider);
246240
Assert.IsNotNull(flavors);
247241
if (!flavors.Any())
@@ -265,7 +259,7 @@ public void TestListFlavorsWithDetails()
265259
[TestCategory(TestCategories.Compute)]
266260
public void TestGetFlavor()
267261
{
268-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
262+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
269263
IEnumerable<FlavorDetails> flavors = ListAllFlavorsWithDetails(provider);
270264
Assert.IsNotNull(flavors);
271265
if (!flavors.Any())
@@ -290,7 +284,7 @@ public void TestGetFlavor()
290284
[TestCategory(TestCategories.Compute)]
291285
public void TestListImages()
292286
{
293-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
287+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
294288
IEnumerable<SimpleServerImage> images = ListAllImages(provider);
295289
Assert.IsNotNull(images);
296290
if (!images.Any())
@@ -313,7 +307,7 @@ public void TestListImages()
313307
[TestCategory(TestCategories.Compute)]
314308
public void TestListImagesWithDetails()
315309
{
316-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
310+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
317311
IEnumerable<ServerImage> images = ListAllImagesWithDetails(provider);
318312
Assert.IsNotNull(images);
319313
if (!images.Any())
@@ -337,7 +331,7 @@ public void TestListImagesWithDetails()
337331
[TestCategory(TestCategories.Compute)]
338332
public void TestGetImage()
339333
{
340-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
334+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
341335
IEnumerable<ServerImage> images = ListAllImagesWithDetails(provider);
342336
Assert.IsNotNull(images);
343337
if (!images.Any())
@@ -383,7 +377,7 @@ public void TestGetImage()
383377
[TestCategory(TestCategories.Compute)]
384378
public void TestListImageMetadata()
385379
{
386-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
380+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
387381
IEnumerable<ServerImage> images = ListAllImagesWithDetails(provider);
388382
Assert.IsNotNull(images);
389383
if (!images.Any())
@@ -415,7 +409,7 @@ public void TestListImageMetadata()
415409
[TestCategory(TestCategories.Compute)]
416410
public void TestGetImageMetadataItem()
417411
{
418-
IComputeProvider provider = new CloudServersProvider(Bootstrapper.Settings.TestIdentity);
412+
IComputeProvider provider = Bootstrapper.CreateComputeProvider();
419413
IEnumerable<ServerImage> images = ListAllImagesWithDetails(provider);
420414
Assert.IsNotNull(images);
421415
if (!images.Any())

0 commit comments

Comments
 (0)