Skip to content

AzureRT PR S42 #1 #1

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
AzureRT merged 7 commits into from
Dec 1, 2014
Merged

AzureRT PR S42 #1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd2ce9a
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Nov 22, 2014
10833de
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Nov 24, 2014
ae2c050
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Nov 29, 2014
da403df
fix test
huangpf Nov 29, 2014
1f53212
fix role configuration deserialization
huangpf Dec 1, 2014
92a0732
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Dec 1, 2014
451839b
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell int…
huangpf Dec 1, 2014
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
11 changes: 9 additions & 2 deletions ...ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,15 @@ public void ProvisionLinuxVM()

try
{
vmPowershellCmdlets.NewAzureQuickVM(OS.Linux, newAzureLinuxVMName, serviceName, linuxImageName, "user",
password, locationName);
Utilities.RetryActionUntilSuccess(() =>
{
if (vmPowershellCmdlets.TestAzureServiceName(serviceName))
{
var op = vmPowershellCmdlets.RemoveAzureService(serviceName);
}

vmPowershellCmdlets.NewAzureQuickVM(OS.Linux, newAzureLinuxVMName, serviceName, linuxImageName, "user", password, locationName);
}, "Windows Azure is currently performing an operation on this hosted service that requires exclusive access.", 10, 30);

// Verify
PersistentVMRoleContext vmRoleCtxt = vmPowershellCmdlets.GetAzureVM(newAzureLinuxVMName, serviceName);
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public DeploymentInfoContext(DeploymentGetResponse deployment)

this.RolesConfiguration = new Dictionary<string, RoleConfiguration>();

var roles = doc.Root.Descendants(this.ns + "Role");
var roles = doc.Root.Descendants(this.ns + "Role").Where(t => t.Parent == doc.Root);

foreach (var role in roles)
{
Expand Down