From b23361651b96fae781264418fb593b72c7d0f4a3 Mon Sep 17 00:00:00 2001 From: Mikkel Hagen Date: Mon, 7 May 2018 16:07:38 -0500 Subject: [PATCH 1/5] [skip ci]. --- .../5-11-Multiple-Cluster.robot | 11 ++++++++--- tests/resources/Nimbus-Util.robot | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot index 7fef7a00cb..1faa0e2aaf 100644 --- a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot +++ b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot @@ -16,7 +16,7 @@ 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*' *** Keywords *** # Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict @@ -52,9 +52,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] + Set Environment Variable TEST_DATASTORE '${datastore}' *** Test Cases *** Test diff --git a/tests/resources/Nimbus-Util.robot b/tests/resources/Nimbus-Util.robot index ec6bc7e216..edb51f490d 100644 --- a/tests/resources/Nimbus-Util.robot +++ b/tests/resources/Nimbus-Util.robot @@ -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] From 9cfbd4eba9a32ad0ca68a11acb1fbbf3e5c1189e Mon Sep 17 00:00:00 2001 From: Mikkel Hagen Date: Mon, 7 May 2018 16:08:38 -0500 Subject: [PATCH 2/5] [skip ci]. --- .../Group5-Functional-Tests/5-11-Multiple-Cluster.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot index 1faa0e2aaf..930df3b44b 100644 --- a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot +++ b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot @@ -16,7 +16,7 @@ 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*' *** Keywords *** # Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict From 5949807975095ca30b930d3a3e51c1081a7dfd39 Mon Sep 17 00:00:00 2001 From: Mikkel Hagen Date: Mon, 7 May 2018 16:11:29 -0500 Subject: [PATCH 3/5] [skip ci]. --- .../Group5-Functional-Tests/5-11-Multiple-Cluster.robot | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot index 930df3b44b..650e5b1390 100644 --- a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot +++ b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot @@ -19,15 +19,6 @@ 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*' *** 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} From 9436c8b6c1730a96dfa199951160f7e8681e0140 Mon Sep 17 00:00:00 2001 From: Mikkel Hagen Date: Mon, 7 May 2018 16:56:25 -0500 Subject: [PATCH 4/5] [skip ci] fix quotes --- .../Group5-Functional-Tests/5-11-Multiple-Cluster.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot index 650e5b1390..51fd48746b 100644 --- a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot +++ b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot @@ -50,7 +50,7 @@ Multiple Cluster Setup ${hosts}= Run govc ls -t HostSystem host/cls @{hosts}= Split To Lines ${hosts} ${datastore}= Get Name of First Local Storage For Host @{hosts}[0] - Set Environment Variable TEST_DATASTORE '${datastore}' + Set Environment Variable TEST_DATASTORE "${datastore}" *** Test Cases *** Test From 7b10d9233dd077cedaeba4b8a91ad1bd1edcf252 Mon Sep 17 00:00:00 2001 From: Mikkel Hagen Date: Tue, 8 May 2018 09:50:46 -0500 Subject: [PATCH 5/5] [skip ci] fix cleanup --- .../Group5-Functional-Tests/5-11-Multiple-Cluster.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot index 51fd48746b..6eeebc80c2 100644 --- a/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot +++ b/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot @@ -16,7 +16,8 @@ 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 *** Multiple Cluster Setup @@ -59,4 +60,3 @@ Test Install VIC Appliance To Test Server certs=${false} vol=default Run Regression Tests - Cleanup VIC Appliance On Test Server