From e11ac93f6019064e7ba53b87c007142fef672171 Mon Sep 17 00:00:00 2001 From: Alan Quillin Date: Sun, 14 Apr 2013 20:27:24 -0500 Subject: [PATCH] Fixed an issue with the Cloud Servers Create Server method --- .../Providers/Rackspace/CloudServersProvider.cs | 13 +++++++------ src/openstack.net.sln | 1 - .../Providers/Rackspace/CloudServersTests.cs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/corelib/Providers/Rackspace/CloudServersProvider.cs b/src/corelib/Providers/Rackspace/CloudServersProvider.cs index 874e45137..605dd7686 100644 --- a/src/corelib/Providers/Rackspace/CloudServersProvider.cs +++ b/src/corelib/Providers/Rackspace/CloudServersProvider.cs @@ -81,21 +81,22 @@ public NewServer CreateServer(string cloudServerName, string imageName, string f NewServerNetwork[] networksToAttach = null; - if (attachToServiceNetwork || attachToPublicNetwork || networks.Any()) - { - var networkList = new List(); + var networkList = new List(); + if (attachToServiceNetwork || attachToPublicNetwork) + { if(attachToPublicNetwork) networkList.Add(new NewServerNetwork { Id = new Guid("00000000-0000-0000-0000-000000000000") }); if(attachToServiceNetwork) networkList.Add(new NewServerNetwork { Id = new Guid("11111111-1111-1111-1111-111111111111") }); + } - if(networks != null && networks.Any()) - networkList.AddRange(networks.Select(id => new NewServerNetwork(){Id = id})); + if (networks != null && networks.Any()) + networkList.AddRange(networks.Select(id => new NewServerNetwork() { Id = id })); + if(networkList.Any()) networksToAttach = networkList.ToArray(); - } var request = new CreateServerRequest { diff --git a/src/openstack.net.sln b/src/openstack.net.sln index d2943441d..198e09c29 100644 --- a/src/openstack.net.sln +++ b/src/openstack.net.sln @@ -75,7 +75,6 @@ Global {EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|x86.ActiveCfg = Debug|Any CPU {EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU {EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Release|Any CPU.Build.0 = Release|Any CPU diff --git a/src/testing/integration/Providers/Rackspace/CloudServersTests.cs b/src/testing/integration/Providers/Rackspace/CloudServersTests.cs index 6e0182027..72ebe00c1 100644 --- a/src/testing/integration/Providers/Rackspace/CloudServersTests.cs +++ b/src/testing/integration/Providers/Rackspace/CloudServersTests.cs @@ -807,7 +807,7 @@ public void Should_Wait_For_Server_To_Go_Into_Verify_Resize_Status() Assert.IsTrue(_resizeSuccess); var provider = new CloudServersProvider(_testIdentity); - var details = provider.WaitForServerState(_testServer.Id, new [] {ServerState.VERIFY_RESIZE, ServerState.ACTIVE}, new[] { ServerState.ERROR, ServerState.UNKNOWN, ServerState.SUSPENDED }); + var details = provider.WaitForServerState(_testServer.Id, ServerState.VERIFY_RESIZE, new[] { ServerState.ERROR, ServerState.UNKNOWN, ServerState.SUSPENDED }); Assert.IsNotNull(details); Assert.AreEqual(ServerState.VERIFY_RESIZE, details.Status);