Skip to content

Commit ece1298

Browse files
author
ading007
authored
Fix the issue of NIMBUS_LOCATION (#8376)
Change to use NIMBUS_LOCATION=sc(wdc) instead of sc(wdc) in Nimbus-Util.robot
1 parent 965f300 commit ece1298

3 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎tests/manual-test-cases/Group5-Functional-Tests/5-29-Opaque-Network.robot‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Suite Teardown Vdnet NSXT Topology Cleanup ${NIMBUS_POD} ${testrunid}
2020

2121
*** Variables ***
2222
${NIMBUS_LOCATION} sc
23+
${NIMBUS_LOCATION_FULL} NIMBUS_LOCATION=${NIMBUS_LOCATION}
2324
${VDNET_LAUNCHER_HOST} 10.160.201.180
2425
${USE_LOCAL_TOOLCHAIN} 0
2526
${VDNET_MC_SETUP} 0
@@ -86,8 +87,8 @@ Vdnet NSXT Topology Cleanup
8687
[Arguments] ${pod_name} ${testrunid}
8788
Open Connection %{NIMBUS_GW}
8889
Wait Until Keyword Succeeds 10 min 30 sec Login %{NIMBUS_USER} %{NIMBUS_PASSWORD}
89-
Execute Command ${NIMBUS_LOCATION} nimbus-ctl --nimbus=${pod_name} kill *${testrunid}*
90-
Execute Command ${NIMBUS_LOCATION} nimbus-ctl --nimbus=${pod_name} kill *isolated-06-gw
90+
Execute Command ${NIMBUS_LOCATION_FULL} nimbus-ctl --nimbus=${pod_name} kill *${testrunid}*
91+
Execute Command ${NIMBUS_LOCATION_FULL} nimbus-ctl --nimbus=${pod_name} kill *isolated-06-gw
9192
Close Connection
9293

9394
*** Test Cases ***

‎tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Resource ../../resources/Util.robot
1818
Suite Setup Nimbus Suite Setup Enhanced Link Mode Setup
1919
Suite Teardown Run Keyword And Ignore Error Nimbus Cleanup ${list}
2020

21+
*** Variables ***
22+
${NIMBUS_LOCATION} sc
23+
${NIMBUS_LOCATION_FULL} NIMBUS_LOCATION=${NIMBUS_LOCATION}
24+
2125
*** Keywords ***
2226
# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
2327
Combine Dictionaries
@@ -35,7 +39,7 @@ Enhanced Link Mode Setup
3539
Set Suite Variable ${user} %{NIMBUS_USER}
3640
Log To Console \nDeploying Nimbus Testbed: ${name}
3741

38-
${pid}= Run Secret SSHPASS command %{NIMBUS_USER} '%{NIMBUS_PASSWORD}' 'nimbus-testbeddeploy --lease 0.25 --noStatsDump --noSupportBundles --plugin test-vpx --testbedName test-vpx-m2n2-vcva-3esx-pxeBoot-8gbmem --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --runName ${name}'
42+
${pid}= Run Secret SSHPASS command %{NIMBUS_USER} '%{NIMBUS_PASSWORD}' '${NIMBUS_LOCATION_FULL} nimbus-testbeddeploy --lease 0.25 --noStatsDump --noSupportBundles --plugin test-vpx --testbedName test-vpx-m2n2-vcva-3esx-pxeBoot-8gbmem --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --runName ${name}'
3943

4044
&{esxes}= Create Dictionary
4145
${num_of_esxes}= Evaluate 3

‎tests/resources/Nimbus-Util.robot‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ Documentation This resource contains any keywords related to using the Nimbus c
1919
${ESX_VERSION} ob-7867845
2020
${VC_VERSION} ob-7867539
2121
${NIMBUS_ESX_PASSWORD} e2eFunctionalTest
22-
${NIMBUS_LOCATION} ${EMPTY}
22+
${NIMBUS_LOCATION} sc
23+
${NIMBUS_LOCATION_FULL} NIMBUS_LOCATION=${NIMBUS_LOCATION}
2324

2425
*** Keywords ***
2526
Fetch IP
2627
[Arguments] ${name}
27-
${out}= Execute Command ${NIMBUS_LOCATION} nimbus-ctl ip %{NIMBUS_USER}-${name} | grep %{NIMBUS_USER}-${name}
28+
${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-ctl ip %{NIMBUS_USER}-${name} | grep %{NIMBUS_USER}-${name}
2829
Should Not Be Empty ${out}
2930
${len}= Get Line Count ${out}
3031
Should Be Equal As Integers ${len} 1
@@ -38,7 +39,7 @@ Get IP
3839

3940
Fetch POD
4041
[Arguments] ${name}
41-
${out}= Execute Command ${NIMBUS_LOCATION} nimbus-ctl list | grep ${name}
42+
${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-ctl list | grep ${name}
4243
Should Not Be Empty ${out}
4344
${len}= Get Line Count ${out}
4445
Should Be Equal As Integers ${len} 1
@@ -53,7 +54,7 @@ Deploy Nimbus ESXi Server
5354
Wait Until Keyword Succeeds 2 min 30 sec Login ${user} ${password}
5455

5556
:FOR ${IDX} IN RANGE 1 5
56-
\ ${out}= Execute Command ${NIMBUS_LOCATION} nimbus-esxdeploy ${name} --disk=48000000 --ssd=24000000 --memory=8192 --lease=0.25 --nics 2 ${version}
57+
\ ${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-esxdeploy ${name} --disk=48000000 --ssd=24000000 --memory=8192 --lease=0.25 --nics 2 ${version}
5758
\ Log ${out}
5859
\ # Make sure the deploy actually worked
5960
\ ${status}= Run Keyword And Return Status Should Contain ${out} To manage this VM use
@@ -143,7 +144,7 @@ Deploy Nimbus vCenter Server
143144
Wait Until Keyword Succeeds 2 min 30 sec Login ${user} ${password}
144145

145146
:FOR ${IDX} IN RANGE 1 5
146-
\ ${out}= Execute Command ${NIMBUS_LOCATION} nimbus-vcvadeploy --lease=0.25 --vcvaBuild ${version} ${name}
147+
\ ${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-vcvadeploy --lease=0.25 --vcvaBuild ${version} ${name}
147148
\ Log ${out}
148149
\ # Make sure the deploy actually worked
149150
\ ${status}= Run Keyword And Return Status Should Contain ${out} Overall Status: Succeeded
@@ -170,7 +171,7 @@ Deploy Nimbus ESXi Server Async
170171
[Tags] secret
171172
[Arguments] ${name} ${version}=${ESX_VERSION}
172173
Log To Console \nDeploying Nimbus ESXi server: ${name}
173-
${out}= Run Secret SSHPASS command %{NIMBUS_USER} '%{NIMBUS_PASSWORD}' '${NIMBUS_LOCATION} nimbus-esxdeploy ${name} --disk\=48000000 --ssd\=24000000 --memory\=8192 --lease=0.25 --nics 2 ${version}'
174+
${out}= Run Secret SSHPASS command %{NIMBUS_USER} '%{NIMBUS_PASSWORD}' '${NIMBUS_LOCATION_FULL} nimbus-esxdeploy ${name} --disk\=48000000 --ssd\=24000000 --memory\=8192 --lease=0.25 --nics 2 ${version}'
174175
[Return] ${out}
175176

176177
Run Secret SSHPASS command
@@ -185,7 +186,7 @@ Deploy Nimbus vCenter Server Async
185186
[Arguments] ${name} ${version}=${VC_VERSION}
186187
Log To Console \nDeploying Nimbus VC server: ${name}
187188

188-
${out}= Run Secret SSHPASS command %{NIMBUS_USER} '%{NIMBUS_PASSWORD}' '${NIMBUS_LOCATION} nimbus-vcvadeploy --lease=0.25 --vcvaBuild ${version} ${name}'
189+
${out}= Run Secret SSHPASS command %{NIMBUS_USER} '%{NIMBUS_PASSWORD}' '${NIMBUS_LOCATION_FULL} nimbus-vcvadeploy --lease=0.25 --vcvaBuild ${version} ${name}'
189190
[Return] ${out}
190191

191192
# Deploys a nimbus testbed based on the specified testbed spec and options
@@ -207,7 +208,7 @@ Deploy Nimbus Testbed
207208

208209
:FOR ${IDX} IN RANGE 1 5
209210
\ Run Keyword Unless '${spec}' == '${EMPTY}' Put File tests/resources/nimbus-testbeds/${spec} destination=./%{BUILD_TAG}/testbeds/
210-
\ ${out}= Execute Command ${NIMBUS_LOCATION} nimbus-testbeddeploy --lease 0.25 ${specarg} ${args}
211+
\ ${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-testbeddeploy --lease 0.25 ${specarg} ${args}
211212
\ Log ${out}
212213
\ # Make sure the deploy actually worked
213214
\ ${status}= Run Keyword And Return Status Should Contain ${out} "deployment_result"=>"PASS"
@@ -220,7 +221,7 @@ Kill Nimbus Server
220221
[Arguments] ${user} ${password} ${name}
221222
Open Connection %{NIMBUS_GW}
222223
Wait Until Keyword Succeeds 2 min 30 sec Login ${user} ${password}
223-
${out}= Execute Command ${NIMBUS_LOCATION} nimbus-ctl kill ${name}
224+
${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-ctl kill ${name}
224225
Log ${out}
225226
Close connection
226227

@@ -230,8 +231,8 @@ Cleanup Nimbus Folders
230231
Wait Until Keyword Succeeds 2 min 30 sec Login %{NIMBUS_USER} %{NIMBUS_PASSWORD}
231232
# TODO: this may need pabot shared resource locking around it for multiple jobs. We're likely making use of the
232233
# retry paths currently but it's not good practice.
233-
Run Keyword If ${deletePXE} Execute Command ${NIMBUS_LOCATION} rm -rf public_html/pxe/* public_html/pxeinstall/*
234-
Execute Command ${NIMBUS_LOCATION} rm -rf %{BUILD_TAG}
234+
Run Keyword If ${deletePXE} Execute Command ${NIMBUS_LOCATION_FULL} rm -rf public_html/pxe/* public_html/pxeinstall/*
235+
Execute Command ${NIMBUS_LOCATION_FULL} rm -rf %{BUILD_TAG}
235236
Close connection
236237

237238
# Cleans up a list of VMs and deletes the pxe folder on nimbus gateway
@@ -453,7 +454,7 @@ Deploy Nimbus NFS Datastore
453454
Open Connection %{NIMBUS_GW}
454455
Wait Until Keyword Succeeds 2 min 30 sec Login ${user} ${password}
455456

456-
${out}= Execute Command ${NIMBUS_LOCATION} nimbus-nfsdeploy ${name} ${additional-args}
457+
${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-nfsdeploy ${name} ${additional-args}
457458
Log ${out}
458459
# Make sure the deploy actually worked
459460
Should Contain ${out} To manage this VM use
@@ -538,7 +539,7 @@ Create Static IP Worker
538539
Log To Console Create a new static ip address worker...
539540
${name}= Evaluate 'static-worker-' + str(random.randint(1000,9999)) + str(time.clock()) modules=random,time
540541
Log To Console \nDeploying static ip worker: ${name}
541-
${out}= Execute Command ${NIMBUS_LOCATION} nimbus-ctl --silentObjectNotFoundError kill '%{NIMBUS_USER}-static-worker' && ${NIMBUS_LOCATION} nimbus-worker-deploy --nimbus ${NIMBUS_POD} --enableStaticIpService ${name}
542+
${out}= Execute Command ${NIMBUS_LOCATION_FULL} nimbus-ctl --silentObjectNotFoundError kill '%{NIMBUS_USER}-static-worker' && ${NIMBUS_LOCATION_FULL} nimbus-worker-deploy --nimbus ${NIMBUS_POD} --enableStaticIpService ${name}
542543
Should Contain ${out} "deploy_status": "success"
543544

544545
${pod}= Fetch POD ${name}

0 commit comments

Comments
 (0)