Update assertion to setup testbed successfully

Output of nimbus command is changed when deploying VIC testbed, so we need to change assertion for it.
vmware · Oct 18, 2021 · 91f8775 · 91f8775
1 parent d4b5f00
commit 91f8775
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/tests/manual-test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.robot b/tests/manual-test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.robot
@@ -28,7 +28,6 @@ Simple VSAN Setup
  Set Suite Variable ${user} %{NIMBUS_PERSONAL_USER}
  ${out}= Deploy Nimbus Testbed spec=vic-vsan.rb args=--plugin testng --noSupportBundles --vcvaBuild "${VC_VERSION}" --esxPxeDir "${ESX_VERSION}" --esxBuild "${ESX_VERSION}" --testbedName vic-vsan-simple-pxeBoot-vcva --runName ${name}
  Log ${out}
- Should Contain ${out} "deployment_result"=>"PASS"
 
  ${out}= Execute Command ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-${name}.vc.0 | grep %{NIMBUS_PERSONAL_USER}-${name}.vc.0
  ${vc_ip}= Fetch From Right ${out} ${SPACE}

diff --git a/tests/manual-test-cases/Group5-Interoperability-Tests/5-06-2-VSAN-Complex.disabled b/tests/manual-test-cases/Group5-Interoperability-Tests/5-06-2-VSAN-Complex.disabled
@@ -28,7 +28,6 @@ VSAN Complex Setup
  ${out}= Deploy Nimbus Testbed spec=vic-vsan.rb args=--plugin testng --noSupportBundles --vcvaBuild "${VC_VERSION}" --esxPxeDir "${ESX_VERSION}" --esxBuild "${ESX_VERSION}" --testbedName vic-vsan-simple-pxeBoot-vcva --runName ${name}
 
  Log ${out}
- Should Contain ${out} "deployment_result"=>"PASS"
 
  ${out}= Split To Lines ${out}
  :FOR ${line} IN @{out}

diff --git a/tests/manual-test-cases/Group5-Interoperability-Tests/5-17-FC-Datastore.disabled b/tests/manual-test-cases/Group5-Interoperability-Tests/5-17-FC-Datastore.disabled
@@ -32,7 +32,6 @@ FC Datastore Setup
  ${name}= Evaluate 'vic-fc-' + str(random.randint(1000,9999)) modules=random
  ${out}= Deploy Nimbus Testbed args=--plugin testng --customizeTestbed '/esx desiredPassword=e2eFunctionalTest' --noSupportBundles --vcvaBuild "${VC_VERSION}" --esxBuild "${ESX_VERSION}" --testbedName vcqa-sdrs-fc-fullInstall-vcva --runName vic-fc
  Set Suite Variable @{list} %{NIMBUS_PERSONAL_USER}-vic-fc.vcva-${VC_VERSION} %{NIMBUS_PERSONAL_USER}-vic-fc.esx.0 %{NIMBUS_PERSONAL_USER}-vic-fc.esx.1 %{NIMBUS_PERSONAL_USER}-vic-fc.fc.0
- Should Contain ${out} "deployment_result"=>"PASS"
 
  ${out}= Execute Command ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-vic-fc.vcva-${VC_VERSION} | grep %{NIMBUS_PERSONAL_USER}-vic-fc.vcva-${VC_VERSION}
  ${vc-ip}= Fetch From Right ${out} ${SPACE}

diff --git a/tests/resources/Nimbus-Util.robot b/tests/resources/Nimbus-Util.robot
@@ -218,7 +218,7 @@ Deploy Nimbus Testbed
  \ ${out}= Execute Command ${NIMBUS_LOCATION_FULL} USER=${personal_user} nimbus-testbeddeploy --lease 0.25 ${specarg} ${args}
  \ Log ${out}
  \ # Make sure the deploy actually worked
- \ ${status}= Run Keyword And Return Status Should Contain ${out} "deployment_result"=>"PASS"
+ \ ${status}= Run Keyword And Return Status Should Contain ${out} END TESTBED DEPLOYMENT
  \ Run Keyword If ${status} and '${spec}' != '${EMPTY}' Execute Command rm -rf ./%{BUILD_TAG}/testbeds/${spec}-${suffix}
  \ Return From Keyword If ${status} ${out}
  \ Log To Console Nimbus deployment ${index} failed, trying again in 1 minute
@@ -229,7 +229,7 @@ Deploy Nimbus Testbed
  \ ${out}= Execute Command ${NIMBUS_LOCATION_FULL} USER=${personal_user} nimbus-testbeddeploy --lease 0.25 ${specarg} ${args}
  \ Log ${out}
  \ # Make sure the deploy actually worked
- \ ${status}= Run Keyword And Return Status Should Contain ${out} "deployment_result"=>"PASS"
+ \ ${status}= Run Keyword And Return Status Should Contain ${out} END TESTBED DEPLOYMENT
  \ Return From Keyword If ${status} ${out}
  \ Log To Console Nimbus deployment ${index} failed, trying again in 1 minute
  \ Sleep 1 minutes