Skip to content

Commit e11ac93

Browse files
author
Alan Quillin
committed
Fixed an issue with the Cloud Servers Create Server method
1 parent 1947228 commit e11ac93

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/corelib/Providers/Rackspace/CloudServersProvider.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,22 @@ public NewServer CreateServer(string cloudServerName, string imageName, string f
8181

8282
NewServerNetwork[] networksToAttach = null;
8383

84-
if (attachToServiceNetwork || attachToPublicNetwork || networks.Any())
85-
{
86-
var networkList = new List<NewServerNetwork>();
84+
var networkList = new List<NewServerNetwork>();
8785

86+
if (attachToServiceNetwork || attachToPublicNetwork)
87+
{
8888
if(attachToPublicNetwork)
8989
networkList.Add(new NewServerNetwork { Id = new Guid("00000000-0000-0000-0000-000000000000") });
9090

9191
if(attachToServiceNetwork)
9292
networkList.Add(new NewServerNetwork { Id = new Guid("11111111-1111-1111-1111-111111111111") });
93+
}
9394

94-
if(networks != null && networks.Any())
95-
networkList.AddRange(networks.Select(id => new NewServerNetwork(){Id = id}));
95+
if (networks != null && networks.Any())
96+
networkList.AddRange(networks.Select(id => new NewServerNetwork() { Id = id }));
9697

98+
if(networkList.Any())
9799
networksToAttach = networkList.ToArray();
98-
}
99100

100101
var request = new CreateServerRequest
101102
{

src/openstack.net.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ Global
7575
{EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7676
{EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
7777
{EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
78-
{EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
7978
{EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Debug|x86.ActiveCfg = Debug|Any CPU
8079
{EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
8180
{EA57BD15-3742-45B8-BDE2-263F7236BAFD}.Release|Any CPU.Build.0 = Release|Any CPU

src/testing/integration/Providers/Rackspace/CloudServersTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ public void Should_Wait_For_Server_To_Go_Into_Verify_Resize_Status()
807807
Assert.IsTrue(_resizeSuccess);
808808

809809
var provider = new CloudServersProvider(_testIdentity);
810-
var details = provider.WaitForServerState(_testServer.Id, new [] {ServerState.VERIFY_RESIZE, ServerState.ACTIVE}, new[] { ServerState.ERROR, ServerState.UNKNOWN, ServerState.SUSPENDED });
810+
var details = provider.WaitForServerState(_testServer.Id, ServerState.VERIFY_RESIZE, new[] { ServerState.ERROR, ServerState.UNKNOWN, ServerState.SUSPENDED });
811811

812812
Assert.IsNotNull(details);
813813
Assert.AreEqual(ServerState.VERIFY_RESIZE, details.Status);

0 commit comments

Comments
 (0)