Skip to content

[skip ci]Select correct datastore for the test #7909

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
mhagen-vmware merged 6 commits into from
May 8, 2018
Merged

[skip ci]Select correct datastore for the test #7909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b233616
[skip ci].
mhagen-vmware May 7, 2018
9cfbd4e
[skip ci].
mhagen-vmware May 7, 2018
5949807
[skip ci].
mhagen-vmware May 7, 2018
9436c8b
[skip ci] fix quotes
mhagen-vmware May 7, 2018
7b10d92
[skip ci] fix cleanup
mhagen-vmware May 8, 2018
f1c5fc3
Merge branch 'master' into feature/get-correct-datastore
mhagen-vmware May 8, 2018
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
22 changes: 9 additions & 13 deletions tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,10 @@
Documentation Test 5-11 - Multiple Clusters
Resource ../../resources/Util.robot
Suite Setup Wait Until Keyword Succeeds 10x 10m Multiple Cluster Setup
Suite Teardown Run Keyword And Ignore Error Nimbus Cleanup Single VM '*5-11-multiple-cluster*'
Suite Teardown Run Keyword And Ignore Error Nimbus Cleanup Single VM '*5-11-multiple-cluster*' ${false}
Test Teardown Cleanup VIC Appliance On Test Server

*** Keywords ***
# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
Combine Dictionaries
[Arguments] ${dict1} ${dict2}
${dict2keys}= Get Dictionary Keys ${dict2}
:FOR ${key} IN @{dict2keys}
\ ${elem}= Get From Dictionary ${dict2} ${key}
\ Set To Dictionary ${dict1} ${key} ${elem}
[Return] ${dict1}

Multiple Cluster Setup
[Timeout] 110 minutes
Run Keyword And Ignore Error Nimbus Cleanup Single VM '*5-11-multiple-cluster*' ${false}
Expand All @@ -52,9 +44,14 @@ Multiple Cluster Setup
Set Environment Variable BRIDGE_NETWORK bridge
Set Environment Variable PUBLIC_NETWORK vm-network
Remove Environment Variable TEST_DATACENTER
Set Environment Variable TEST_DATASTORE local-0
Set Environment Variable TEST_RESOURCE cls
Set Environment Variable TEST_TIMEOUT 15m
Set Environment Variable TEST_RESOURCE cls

# Get one of the hosts in the cluster we want and make sure we use the correct local datastore
${hosts}= Run govc ls -t HostSystem host/cls
@{hosts}= Split To Lines ${hosts}
${datastore}= Get Name of First Local Storage For Host @{hosts}[0]
Copy link
Contributor

@rajanashok rajanashok May 7, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Understand it is always a good practice not to hard-code. But Is there a specific reason why we look for the first datastore in the list?
lgtm otherwise.

Copy link
Contributor Author

@mhagen-vmware mhagen-vmware May 7, 2018

Choose a reason for hiding this comment

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

it is local storage, so it doesn't matter which one just so long as it is on the host.

Set Environment Variable TEST_DATASTORE "${datastore}"

*** Test Cases ***
Test
Expand All @@ -63,4 +60,3 @@ Test

Install VIC Appliance To Test Server certs=${false} vol=default
Run Regression Tests
Cleanup VIC Appliance On Test Server
6 changes: 6 additions & 0 deletions tests/resources/Nimbus-Util.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,3 +562,9 @@ Is Nimbus Location WDC
${status}= Run Keyword And Return Status Should Not Be Empty ${out}
Close Connection
[Return] ${status}

Get Name of First Local Storage For Host
[Arguments] ${host}
${datastores}= Run govc host.info -host ${host} -json | jq -r '.HostSystems[].Config.FileSystemVolume.MountInfo[].Volume | select (.Type\=\="VMFS") | select (.Local\=\=true) | .Name'
@{datastores}= Split To Lines ${datastores}
[Return] @{datastores}[0]