Skip to content

AzureRT PR - CLU Test Updates #1566

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
merged 7 commits into from
Jan 1, 2016
Merged

AzureRT PR - CLU Test Updates #1566

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d5e676
Update Difference Result Output
huangpf Dec 24, 2015
6866f6b
Add VM Size Bash Tests
huangpf Dec 24, 2015
e056251
Merge pull request #282 from Azure/clu
huangpf Dec 30, 2015
2f1df81
Fix CLU Mutex Issue
huangpf Dec 31, 2015
50ed951
Merge pull request #286 from Azure/clu
huangpf Dec 31, 2015
99623cf
Merge pull request #289 from Azure/clu
huangpf Jan 1, 2016
bda40bf
Update Tests
huangpf Jan 1, 2016
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
6 changes: 6 additions & 0 deletions examples/compute-management/01-VirtualMachineSizes.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Param(
[string]$resourceGroupName,
[string]$resourceGroupLocation
)

Write-Host "Skip"
34 changes: 34 additions & 0 deletions examples/compute-management/01-VirtualMachineSizes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/bash
set -e
printf "\n=== Managing Virtual Machine Sizes in Azure Compute ===\n"

printf "\nShowing VM size results in location: %s.\n" "$location"
azure vmsize get --location "$location"

printf "\nChecking VM size results in location: %s.\n" "$location"
vmSizeResult=`azure vmsize get --location "$location"`

if [ "$vmSizeResult" = "" ]; then
echo "Failure: No VM sizes!" 1>&2
exit 1
else
printf "\nSuccess: Non-empty Results.\n"
fi

queryString=Standard_A0
result=`echo "$vmSizeResult" | grep -q "$queryString"`
if [ "$vmSizeResult" = "" ] ; then
printf "\nFailure: VM Size Not Found: '%s'.\n" "$queryString"
exit 1
else
printf "\nSuccess: VM Size Found in Results: '%s'.\n" "$queryString"
fi

queryString=Standard_G1
result=`echo "$vmSizeResult" | grep -q "$queryString"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stankovski @hovsepm @markcowl
What's the correct way to do string operations and test the not-containing case?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like one of the options: http://stackoverflow.com/questions/229551/string-contains-in-bash

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I had try the [[ method, but the test runner throws error. @stankovski Could you please help try it on your end? Thanks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code worked for me:

vmSizeResult="Test string with Standard_A0"
queryString=Standard_A0

if [[ $vmSizeResult != *$queryString* ]]; then
    printf "\nFailure: VM Size Not Found: '%s'.\n" "$queryString"
    exit 1
else
    printf "\nSuccess: VM Size Found in Results: '%s'.\n" "$queryString"
fi

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget the spaces around [[ - they are important

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would throw the following error [[: command not found, using the same code above. Any configuration I need to make? Thanks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is a working test:

#!/bin/bash
set -e
printf "\n=== Managing Virtual Machine Sizes in Azure Compute ===\n"

printf "\n1. Showing VM size results in location: %s.\n" "$location"
azure vmsize get --location "$location"

printf "\n2. Checking VM size results in location: %s.\n" "$location"
vmSizeResult=`azure vmsize get --location "$location"`

if [[ $vmSizeResult == "" ]]; then
    echo "Failure: No VM sizes!" 1>&2
    exit 1
else
    echo "Success: Non-empty Results."
fi

filterResult=`azure vmsize get --location "$location" | cat | jq 'select(.name | contains("Standard_A0"))' --raw-output`
if [[ "$filterResult" == "" ]]; then
    echo "Failure: Standard_A0 vm size not found." 1>&2
    exit 1
else
    echo "Success: Standard_A0 vm size found."
fi

filterResult=`azure vmsize get --location "$location" | cat | jq 'select(.name | contains("Standard_G1"))' --raw-output`
if [[ "$filterResult" == "" ]]; then
    echo "Failure: Standard_G1 vm size not found." 1>&2
    exit 1
else
    echo "Success: Standard_G1 vm size found."
fi

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @stankovski . bash 4.0 works. I have updated the PR. Could you please help review again? Thanks.

if [ "$vmSizeResult" = "" ] ; then
printf "\nFailure: VM Size Not Found: '%s'.\n" "$queryString"
exit 1
else
printf "\nSuccess: VM Size Found in Results: '%s'.\n" "$queryString"
fi
1 change: 1 addition & 0 deletions examples/virtual-hard-disk/01-VirtualHardDisks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ azure vhd save -o --resourcegroupname "$groupName" --sourceuri https://"$storage

printf "\n5. Validating the downloaded file is the same.\n"
diffResult=`diff ./test_downloaded_by_clu.vhd $BASEDIR/test_uploaded_byps.vhd`
printf "Difference Result = '%s'.\n" "$diffResult"
if [ "$diffResult" = "" ]; then
echo "Checked"
else
Expand Down
7 changes: 7 additions & 0 deletions src/CLU/Commands.Common.ScenarioTest/SampleTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,12 @@ public void VirtualHardDisksTest()
var helper = _collectionState.GetRunner("virtual-hard-disk");
helper.RunScript("01-VirtualHardDisks");
}

[Fact]
public void VirtualMachineSizeTest()
{
var helper = _collectionState.GetRunner("compute-management");
helper.RunScript("01-VirtualMachineSizes");
}
}
}
4 changes: 3 additions & 1 deletion src/CLU/Sync/Upload/BlobCreatorBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,9 @@ private static Mutex AcquireSingleInstanceMutex(Uri destinationBlobUri)
Mutex singleInstanceMutex = null;
try
{
singleInstanceMutex = new Mutex(false, @"Global\" + mutexName);
// TODO: CLU
singleInstanceMutex = new Mutex(false);
//singleInstanceMutex = new Mutex(false, @"Global\" + mutexName);
// TODO: CLU
if (!singleInstanceMutex.WaitOne(TimeSpan.FromSeconds(5)))
//if (!singleInstanceMutex.WaitOne(TimeSpan.FromSeconds(5), false))
Expand Down