Skip to content

Fixed an issue with the Cloud Servers Create Server method #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanquillin merged 1 commit into from
Apr 15, 2013
+8 −8
Merged

Fixed an issue with the Cloud Servers Create Server method #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/corelib/Providers/Rackspace/CloudServersProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<NewServerNetwork>();
var networkList = new List<NewServerNetwork>();

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
{
Expand Down
1 change: 0 additions & 1 deletion src/openstack.net.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/testing/integration/Providers/Rackspace/CloudServersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down