diff --git a/build/build.proj b/build/build.proj
index 547282d62..45dc05a15 100644
--- a/build/build.proj
+++ b/build/build.proj
@@ -20,15 +20,20 @@
-
-
+
+
+
+
+
+
+
@@ -38,6 +43,9 @@
+
+
+
@@ -61,13 +69,22 @@
-
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -90,7 +107,7 @@
-
+
diff --git a/build/update-nuget-package.ps1 b/build/update-nuget-package.ps1
new file mode 100644
index 000000000..ce8a9153b
--- /dev/null
+++ b/build/update-nuget-package.ps1
@@ -0,0 +1,8 @@
+param (
+ [string]$pkgPath,
+ [string]$docXmlPath
+)
+
+$pkg = [System.IO.Compression.ZipFile]::Open($pkgPath, "Update" )
+[System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($pkg, $docXmlPath, "lib\net45\openstacknet.xml", "Optimal")
+$pkg.Dispose()
\ No newline at end of file
diff --git a/src/corelib/corelib.nuspec b/src/corelib/corelib.nuspec
index 07800a5e9..e4b37eb40 100644
--- a/src/corelib/corelib.nuspec
+++ b/src/corelib/corelib.nuspec
@@ -24,9 +24,10 @@
+
-
+
diff --git a/src/testing/integration/Compute/v2_1/FlavorTests.cs b/src/testing/integration/Compute/v2_1/FlavorTests.cs
index 69fd90d02..4169160e1 100644
--- a/src/testing/integration/Compute/v2_1/FlavorTests.cs
+++ b/src/testing/integration/Compute/v2_1/FlavorTests.cs
@@ -60,6 +60,7 @@ public async Task GetFlavorTest()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task ListFlavorsTest()
{
var results = await _compute.ListFlavorsAsync();
diff --git a/src/testing/integration/Compute/v2_1/ImageTests.cs b/src/testing/integration/Compute/v2_1/ImageTests.cs
index a11b99655..4b0bf2995 100644
--- a/src/testing/integration/Compute/v2_1/ImageTests.cs
+++ b/src/testing/integration/Compute/v2_1/ImageTests.cs
@@ -66,6 +66,7 @@ public async Task FindSnapshotsTest()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task ListImagesTest()
{
var results = await _compute.ListImagesAsync(new ImageListOptions { PageSize = 1 });
diff --git a/src/testing/integration/Compute/v2_1/KeyPairTests.cs b/src/testing/integration/Compute/v2_1/KeyPairTests.cs
index e068b1109..0fb278e0e 100644
--- a/src/testing/integration/Compute/v2_1/KeyPairTests.cs
+++ b/src/testing/integration/Compute/v2_1/KeyPairTests.cs
@@ -36,6 +36,7 @@ public void Dispose()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task CreateKeyPairTest()
{
var request = _testData.BuildKeyPairRequest();
diff --git a/src/testing/integration/Compute/v2_1/SecurityGroupTests.cs b/src/testing/integration/Compute/v2_1/SecurityGroupTests.cs
index d3e9036e1..e1cf08a34 100644
--- a/src/testing/integration/Compute/v2_1/SecurityGroupTests.cs
+++ b/src/testing/integration/Compute/v2_1/SecurityGroupTests.cs
@@ -47,9 +47,10 @@ public async Task SecurityGroupTest()
Assert.Equal(definition.Name, securityGroup.Name);
Assert.Equal(definition.Description, securityGroup.Description);
- Trace.WriteLine("Creatinga server associated with the security group...");
+ Trace.WriteLine("Creating a server associated with the security group...");
var serverDefinition = _testData.BuildServer();
serverDefinition.SecurityGroups.Add(new SecurityGroupReference());
+
Trace.WriteLine("Updating the security group...");
string updatedName = securityGroup.Name + "UPDATED";
securityGroup.Name = updatedName;
@@ -78,6 +79,7 @@ public async Task ListSecurityGroupsTest()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task SecurityGroupRuleTest()
{
Trace.WriteLine("Creating security group...");
diff --git a/src/testing/integration/Compute/v2_1/ServerGroupTests.cs b/src/testing/integration/Compute/v2_1/ServerGroupTests.cs
index ebef147b3..524ae3341 100644
--- a/src/testing/integration/Compute/v2_1/ServerGroupTests.cs
+++ b/src/testing/integration/Compute/v2_1/ServerGroupTests.cs
@@ -34,6 +34,7 @@ public void Dispose()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task CreateServerGroup_AndAssociateAServerTest()
{
ServerGroupDefinition definition = _testData.BuildServerGroup();
diff --git a/src/testing/integration/Compute/v2_1/ServerTests.cs b/src/testing/integration/Compute/v2_1/ServerTests.cs
index c67ed6a6f..0c156ad06 100644
--- a/src/testing/integration/Compute/v2_1/ServerTests.cs
+++ b/src/testing/integration/Compute/v2_1/ServerTests.cs
@@ -80,7 +80,7 @@ public async Task CreateServerTest()
}
[Fact]
- [Trait("ci", "false")] // TODO: Run with CI tests once we've implemented cinder
+ [Trait("manual", "true")] // TODO: Run with CI tests once we've implemented cinder
public async Task BootFromVolume()
{
var definition = _testData.BuildServer();
@@ -95,7 +95,7 @@ public async Task BootFromVolume()
}
[Fact]
- [Trait("ci", "false")] // TODO: Run with CI tests once we've implemented cinder
+ [Trait("manual", "true")] // TODO: Run with CI tests once we've implemented cinder
public async Task BootFromVolumeCopy()
{
var definition = _testData.BuildServer();
@@ -269,6 +269,7 @@ public async Task LookupServerAddressesTest()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task SnapshotServerTest()
{
var server = await _testData.CreateServer();
diff --git a/src/testing/integration/Compute/v2_1/VolumeTests.cs b/src/testing/integration/Compute/v2_1/VolumeTests.cs
index d4b8d60a3..c5a47acd3 100644
--- a/src/testing/integration/Compute/v2_1/VolumeTests.cs
+++ b/src/testing/integration/Compute/v2_1/VolumeTests.cs
@@ -34,15 +34,6 @@ public void Dispose()
_testData.Dispose();
}
- // Endpoint is documented but doesn't exist
- //[Fact]
- //public async Task ListVolumeTypes()
- //{
- // var types = await _compute.ListVolumeTypesAsync();
- // Assert.NotNull(types);
- // Assert.Contains("lvm", types.Select(x => x.Name));
- //}
-
[Fact]
public async Task VolumesTest()
{
@@ -89,6 +80,7 @@ public async Task AttachVolumeTest()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task SnapshotsTest()
{
var volume = await _testData.CreateVolume();
diff --git a/src/testing/integration/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceTests.cs b/src/testing/integration/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceTests.cs
index ade119efa..65f516bac 100644
--- a/src/testing/integration/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceTests.cs
+++ b/src/testing/integration/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceTests.cs
@@ -5,7 +5,7 @@
namespace OpenStack.ContentDeliveryNetworks.v1
{
- [Trait("ci","false")] // TODO: Run these with the CI tests once Poppy is installed on our environment
+ [Trait("manual","true")] // TODO: Run these with the CI tests once Poppy is installed on our environment
public class ContentDeliveryNetworkServiceTests : IDisposable
{
private readonly ContentDeliveryNetworkService _cdnService;
diff --git a/src/testing/integration/ContentDeliveryNetworks/v1/ServiceTests.cs b/src/testing/integration/ContentDeliveryNetworks/v1/ServiceTests.cs
index 58384b15c..e478a7983 100644
--- a/src/testing/integration/ContentDeliveryNetworks/v1/ServiceTests.cs
+++ b/src/testing/integration/ContentDeliveryNetworks/v1/ServiceTests.cs
@@ -11,7 +11,7 @@
namespace OpenStack.ContentDeliveryNetworks.v1
{
- [Trait("ci","false")]
+ [Trait("manual","true")]
public class ServiceTests : IDisposable
{
private readonly ContentDeliveryNetworkService _cdnService;
diff --git a/src/testing/integration/Identity/v2/IdentityTests.cs b/src/testing/integration/Identity/v2/IdentityTests.cs
index e0091db07..fb69a8ad2 100644
--- a/src/testing/integration/Identity/v2/IdentityTests.cs
+++ b/src/testing/integration/Identity/v2/IdentityTests.cs
@@ -19,6 +19,7 @@ public IdentityTests(ITestOutputHelper testLog)
}
[Fact]
+ [Trait("smoke", "true")]
public void AuthenticateTest()
{
var userAccess = _identityService.Authenticate();
diff --git a/src/testing/integration/Networking/v2/NetworkingServiceTests.cs b/src/testing/integration/Networking/v2/NetworkingServiceTests.cs
index 859977c8f..1bd8ed513 100644
--- a/src/testing/integration/Networking/v2/NetworkingServiceTests.cs
+++ b/src/testing/integration/Networking/v2/NetworkingServiceTests.cs
@@ -114,6 +114,7 @@ public async Task GetNetworkTest()
#region Subnets
[Fact]
+ [Trait("smoke", "true")]
public async Task CreateSubnetTest()
{
var network = await _testData.CreateNetwork();
@@ -216,7 +217,7 @@ public async Task GetSubnetTest()
#endregion
#region Ports
- [Fact]
+ [Fact] // this was my first choice for a smoke test however, it is flaky because of race conditions in the API
public async Task CreatePortTest()
{
var network = await _testData.CreateNetwork();
@@ -289,6 +290,7 @@ public async Task UpdatePortTest()
}
[Fact]
+ [Trait("smoke", "true")]
public async Task ListPortsTest()
{
var network = await _testData.CreateNetwork();