VIC scenario related cases are auto launched by Jenkins every mid night, which uses fixed public nimbus account for testing. We also have other jenkins job, such as vic-pr-test which also need a nimbus account(with password) to validate personal code changes. Everyone is now also using public account when using vic-pr-test. And we sometimes hit nimbus env created failure when one public account is used by several jenkin jobs. so we're adding user parameter in nimbus commands to avoid env resource application conflicts, at the same time use public accout with full rights to login nimbus. (#8413)

danfengliu · web-flow · commit 4fa596171c28 · 2018-12-24T11:33:50.000+08:00
diff --git a/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.robot b/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.robot
@@ -59,7 +59,7 @@ Gather All vSphere Logs
     #This does not work currently, as the VM has been migrated out of the vApp
 
 Step 6-9
-    Set Test Variable  ${user}  %{NIMBUS_USER}
+    Set Test Variable  ${user}  %{NIMBUS_PERSONAL_USER}
     Set Suite Variable  @{list}  ${user}-vic-vmotion-13-1.vcva-${VC_VERSION}  ${user}-vic-vmotion-13-1.esx.0  ${user}-vic-vmotion-13-1.esx.1  ${user}-vic-vmotion-13-1.esx.2  ${user}-vic-vmotion-13-1.esx.3  ${user}-vic-vmotion-13-1.nfs.0  ${user}-vic-vmotion-13-1.iscsi.0
     Install VIC Appliance To Test Server
     Run Regression Tests
diff --git a/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.robot b/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.robot
@@ -26,7 +26,7 @@ Gather All vSphere Logs
 
 *** Test Cases ***
 Test
-    Set Test Variable  ${user}  %{NIMBUS_USER}
+    Set Test Variable  ${user}  %{NIMBUS_PERSONAL_USER}
     Set Suite Variable  @{list}  ${user}-vic-vmotion-13-2.vcva-${VC_VERSION}  ${user}-vic-vmotion-13-2.esx.0  ${user}-vic-vmotion-13-2.esx.1  ${user}-vic-vmotion-13-2.esx.2  ${user}-vic-vmotion-13-2.esx.3  ${user}-vic-vmotion-13-2.nfs.0  ${user}-vic-vmotion-13-2.iscsi.0
     Install VIC Appliance To Test Server
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.robot
@@ -34,7 +34,7 @@ Distributed Switch Setup
     @{esx_names}=  Get Dictionary Keys  ${esxes}
     @{esx_ips}=  Get Dictionary Values  ${esxes}
 
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_PERSONAL_USER}-${vc}
 
     # Finish vCenter deploy
     ${output}=  Wait For Process  ${pid}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.robot
@@ -54,7 +54,7 @@ Multiple Datacenter Setup
     ${esx2-ip}=  Get From List  ${esx-ips}  1
 
     ${esx3}  ${esx4}  ${esx5}  ${vc}  ${esx3-ip}  ${esx4-ip}  ${esx5-ip}  ${vc-ip}=  Create a Simple VC Cluster  datacenter1  cls1
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${esx4}  ${esx5}  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${esx4}  ${esx5}  %{NIMBUS_PERSONAL_USER}-${vc}
 
     Log To Console  Create datacenter2 on the VC
     ${out}=  Run  govc datacenter.create datacenter2
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.robot
@@ -24,7 +24,7 @@ Multiple VLAN Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster  multi-vlan-1  cls
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_PERSONAL_USER}-${vc}
 
 *** Test Cases ***
 Test1
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.robot
@@ -23,7 +23,7 @@ Remove Container OOB Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_PERSONAL_USER}-${vc}
 
 *** Test Cases ***
 Docker run a container and verify cannot destroy the VM Out of Band
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.robot
@@ -18,22 +18,26 @@ Resource  ../../resources/Util.robot
 Suite Setup  Wait Until Keyword Succeeds  10x  10s  iSCSI Datastore Setup
 Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
 
+*** Variables ***
+${NIMBUS_LOCATION}  sc
+${NIMBUS_LOCATION_FULL}  NIMBUS_LOCATION=${NIMBUS_LOCATION}
+
 *** Keywords ***
 iSCSI Datastore Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${name}=  Evaluate  'vic-iscsi-' + str(random.randint(1000,9999))  modules=random
     ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --plugin testng --customizeTestbed '/esx desiredPassword=e2eFunctionalTest' --noSupportBundles --vcvaBuild ${VC_VERSION} --esxBuild ${ESX_VERSION} --testbedName vcqa-sdrs-iscsi-fullInstall-vcva --runName vic-iscsi
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-vic-iscsi.vcva-${VC_VERSION}  %{NIMBUS_USER}-vic-iscsi.esx.0  %{NIMBUS_USER}-vic-iscsi.esx.1  %{NIMBUS_USER}-vic-iscsi.iscsi.0
+    Set Suite Variable  @{list}  %{NIMBUS_PERSONAL_USER}-vic-iscsi.vcva-${VC_VERSION}  %{NIMBUS_PERSONAL_USER}-vic-iscsi.esx.0  %{NIMBUS_PERSONAL_USER}-vic-iscsi.esx.1  %{NIMBUS_PERSONAL_USER}-vic-iscsi.iscsi.0
     Should Contain  ${out}  "deployment_result"=>"PASS"
 
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-iscsi.vcva-${VC_VERSION} | grep %{NIMBUS_USER}-vic-iscsi.vcva-${VC_VERSION}
+    ${out}=  Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-vic-iscsi.vcva-${VC_VERSION} | grep %{NIMBUS_PERSONAL_USER}-vic-iscsi.vcva-${VC_VERSION}
     ${vc-ip}=  Fetch From Right  ${out}  ${SPACE}
     
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-iscsi.esx.0 | grep %{NIMBUS_USER}-vic-iscsi.esx.0
+    ${out}=  Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-vic-iscsi.esx.0 | grep %{NIMBUS_PERSONAL_USER}-vic-iscsi.esx.0
     ${esx0-ip}=  Fetch From Right  ${out}  ${SPACE}
     
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-iscsi.esx.1 | grep %{NIMBUS_USER}-vic-iscsi.esx.1
+    ${out}=  Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-vic-iscsi.esx.1 | grep %{NIMBUS_PERSONAL_USER}-vic-iscsi.esx.1
     ${esx1-ip}=  Fetch From Right  ${out}  ${SPACE}
 
     Set Environment Variable  GOVC_URL  ${esx0-ip}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.robot
@@ -18,22 +18,26 @@ Resource  ../../resources/Util.robot
 Suite Setup  Nimbus Suite Setup  FC Datastore Setup
 Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
 
+*** Variables ***
+${NIMBUS_LOCATION}  sc
+${NIMBUS_LOCATION_FULL}  NIMBUS_LOCATION=${NIMBUS_LOCATION}
+
 *** Keywords ***
 FC Datastore Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${name}=  Evaluate  'vic-fc-' + str(random.randint(1000,9999))  modules=random
     ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --plugin testng --customizeTestbed '/esx desiredPassword=e2eFunctionalTest' --noSupportBundles --vcvaBuild ${VC_VERSION} --esxBuild ${ESX_VERSION} --testbedName vcqa-sdrs-fc-fullInstall-vcva --runName ${name}
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-${name}.vcva-${VC_VERSION}  %{NIMBUS_USER}-${name}.esx.0  %{NIMBUS_USER}-${name}.esx.1  %{NIMBUS_USER}-${name}.fc.0
+    Set Suite Variable  @{list}  %{NIMBUS_PERSONAL_USER}-${name}.vcva-${VC_VERSION}  %{NIMBUS_PERSONAL_USER}-${name}.esx.0  %{NIMBUS_PERSONAL_USER}-${name}.esx.1  %{NIMBUS_PERSONAL_USER}-${name}.fc.0
     Should Contain  ${out}  "deployment_result"=>"PASS"
 
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-${name}.vcva-${VC_VERSION} | grep %{NIMBUS_USER}-${name}.vcva-${VC_VERSION}
+    ${out}=  Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-${name}.vcva-${VC_VERSION} | grep %{NIMBUS_PERSONAL_USER}-${name}.vcva-${VC_VERSION}
     ${vc-ip}=  Fetch From Right  ${out}  ${SPACE}
     
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-${name}.esx.0 | grep %{NIMBUS_USER}-${name}.esx.0
+    ${out}=  Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-${name}.esx.0 | grep %{NIMBUS_PERSONAL_USER}-${name}.esx.0
     ${esx0-ip}=  Fetch From Right  ${out}  ${SPACE}
     
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-${name}.esx.1 | grep %{NIMBUS_USER}-${name}.esx.1
+    ${out}=  Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-${name}.esx.1 | grep %{NIMBUS_PERSONAL_USER}-${name}.esx.1
     ${esx1-ip}=  Fetch From Right  ${out}  ${SPACE}
 
     Set Environment Variable  GOVC_URL  ${esx0-ip}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.robot
@@ -23,16 +23,16 @@ SDRS Datastore Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     {out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --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_USER}-vic-fc.vcva-${VC_VERSION}  %{NIMBUS_USER}-vic-fc.esx.0  %{NIMBUS_USER}-vic-fc.esx.1  %{NIMBUS_USER}-vic-fc.fc.0
+    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-ctl ip %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION} | grep %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION}
+    ${out}=  Execute Command  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}
     
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.esx.0 | grep %{NIMBUS_USER}-vic-fc.esx.0
+    ${out}=  Execute Command  USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-vic-fc.esx.0 | grep %{NIMBUS_PERSONAL_USER}-vic-fc.esx.0
     ${esx0-ip}=  Fetch From Right  ${out}  ${SPACE}
     
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.esx.1 | grep %{NIMBUS_USER}-vic-fc.esx.1
+    ${out}=  Execute Command  USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl ip %{NIMBUS_PERSONAL_USER}-vic-fc.esx.1 | grep %{NIMBUS_PERSONAL_USER}-vic-fc.esx.1
     ${esx1-ip}=  Fetch From Right  ${out}  ${SPACE}
 
     Set Environment Variable  GOVC_URL  ${esx0-ip}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.robot
@@ -33,7 +33,7 @@ Cluster Setup
     @{esx_names}=  Get Dictionary Keys  ${esxes}
     @{esx_ips}=  Get Dictionary Values  ${esxes}
 
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_PERSONAL_USER}-${vc}
 
     # Finish vCenter deploy
     ${output}=  Wait For Process  ${pid}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot
@@ -31,7 +31,7 @@ Non vSphere Local Cluster Install Setup
     &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  3  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${ESX_VERSION}
     @{esx_names}=  Get Dictionary Keys  ${esxes}
     @{esx_ips}=  Get Dictionary Values  ${esxes}
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_PERSONAL_USER}-${vc}
 
     # Finish vCenter deploy
     ${output}=  Wait For Process  ${pid}  timeout=70 minutes  on_timeout=terminate
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-25-OPS-User-Grant.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-25-OPS-User-Grant.robot
@@ -26,7 +26,7 @@ Ops User Create
     Set Suite Variable  ${cluster}  cls1
     ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster  ${datacenter}  ${cluster}
     Log To Console  Finished Creating Cluster ${vc}
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_PERSONAL_USER}-${vc}
     ${vc}=  Set Variable  vcname
 
     Set Suite Variable  ${ops_user_base_name}  vch-user
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-29-Opaque-Network.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-29-Opaque-Network.robot
@@ -32,6 +32,11 @@ ${ESX_VERSION}  ob-7389243
 ${nsxt_username}  admin
 ${nsxt_password}  Admin\!23Admin
 
+${NIMBUS_NSXT_USER}  svc.victestuser
+${NIMBUS_NSXT_PASSWORD}  Q2D6EEi8k7hcWL2xj99
+
+${nimbus_personal_user_cache}  %{NIMBUS_PERSONAL_USER}
+
 *** Keywords ***
 Vdnet NSXT Topology Setup
     [Timeout]    180 minutes
@@ -40,22 +45,27 @@ Vdnet NSXT Topology Setup
     ${file}=  Replace Variables  ${json}
     Create File  /tmp/vic-vdnet-nsxt.json  ${file}
 
+    # Unset NIMBUS_PERSONAL_USER, replace value to NSXT user so that all nimbus commands executed by NSXT user
+    Remove Environment Variable  NIMBUS_PERSONAL_USER
+    Set Environment Variable  NIMBUS_PERSONAL_USER  ${NIMBUS_NSXT_USER}
+
     Open Connection  ${VDNET_LAUNCHER_HOST}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
+    #Login account must be the value of variable in this test suit, otherwise other pulic accounts will have no right to perform on 10.160.201.180. 
+    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${NIMBUS_NSXT_USER}  ${NIMBUS_NSXT_PASSWORD}
 
     Put File  /tmp/vic-vdnet-nsxt.json  destination=/tmp/vic-vdnet-nsxt.json
     #Deploy the testbed
-    ${result}=  Execute Command  cd /src/nsx-qe/automation && VDNET_MC_SETUP=${VDNET_MC_SETUP} USE_LOCAL_TOOLCHAIN=${USE_LOCAL_TOOLCHAIN} NIMBUS_BASE=${NIMBUS_BASE} vdnet3/test.py --config /tmp/vic-vdnet-nsxt.json /src/nsx-qe/automation/TDS/NSXTransformers/Openstack/HybridEdge/OSDeployTds.yaml::DeployOSMHTestbed --testbed save
+    ${result}=  Execute Command  cd /src/nsx-qe/automation && VDNET_MC_SETUP=${VDNET_MC_SETUP} USE_LOCAL_TOOLCHAIN=${USE_LOCAL_TOOLCHAIN} NIMBUS_BASE=${NIMBUS_BASE} vdnet3/test.py --config /tmp/vic-vdnet-nsxt.json /src/nsx-qe/automation/TDS/NSXTransformers/Openstack/HybridEdge/OSDeployTds.yaml::DeployOSMHTestbed --testbed save 2>&1
     Log  ${result}
     Should Not Contain  ${result}  failed
     #Run the test cases to customize NSXT and vCenter
-    ${result}=  Execute Command  cd /src/nsx-qe/automation && VDNET_MC_SETUP=${VDNET_MC_SETUP} USE_LOCAL_TOOLCHAIN=${USE_LOCAL_TOOLCHAIN} NIMBUS_BASE=${NIMBUS_BASE} vdnet3/test.py --config /tmp/vic-vdnet-nsxt.json /src/nsx-qe/automation/TDS/NSXTransformers/Openstack/HybridEdge/OSDeployTds.yaml::DeployOSMHTestbed --testbed reuse
+    ${result}=  Execute Command  cd /src/nsx-qe/automation && VDNET_MC_SETUP=${VDNET_MC_SETUP} USE_LOCAL_TOOLCHAIN=${USE_LOCAL_TOOLCHAIN} NIMBUS_BASE=${NIMBUS_BASE} vdnet3/test.py --config /tmp/vic-vdnet-nsxt.json /src/nsx-qe/automation/TDS/NSXTransformers/Openstack/HybridEdge/OSDeployTds.yaml::DeployOSMHTestbed --testbed reuse 2>&1
     Log  ${result}
     Should Not Contain  ${result}  failed
     Close connection
 
     Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  10 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
+    Wait Until Keyword Succeeds  10 min  30 sec  Login  ${NIMBUS_NSXT_USER}  ${NIMBUS_NSXT_PASSWORD}
     ${vc-ip}=  Get IP  vdnet-vc-${VC_VERSION}-1-${TESTRUNID}
     ${nsxt-mgr-ip}=  Get IP  vdnet-nsxmanager-${NSX_VERSION}-1-${TESTRUNID}
     ${pod}=  Fetch POD  vdnet-nsxmanager-${NSX_VERSION}-1-${TESTRUNID}
@@ -85,10 +95,15 @@ Vdnet NSXT Topology Setup
 Vdnet NSXT Topology Cleanup
     [Timeout]    180 minutes
     [Arguments]    ${pod_name}  ${testrunid}
+
+    #Reset NIMBUS_PERSONAL_USER value to the initial value
+    Remove Environment Variable  NIMBUS_PERSONAL_USER
+    Set Environment Variable  NIMBUS_PERSONAL_USER  ${nimbus_personal_user_cache}
+
     Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  10 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Execute Command  ${NIMBUS_LOCATION_FULL} nimbus-ctl --nimbus=${pod_name} kill *${testrunid}*
-    Execute Command  ${NIMBUS_LOCATION_FULL} nimbus-ctl --nimbus=${pod_name} kill *isolated-06-gw
+    Wait Until Keyword Succeeds  10 min  30 sec  Login  ${NIMBUS_NSXT_USER}  ${NIMBUS_NSXT_PASSWORD}
+    Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl --nimbus=${pod_name} kill *${testrunid}*
+    Execute Command  ${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl --nimbus=${pod_name} kill *isolated-06-gw
     Close Connection
 
 *** Test Cases ***
@@ -119,4 +134,3 @@ Basic VIC Tests with NSXT Topology
     Should Not Contain  ${output}  Error
 
     Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
-
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot
@@ -36,10 +36,10 @@ Enhanced Link Mode Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${name}=  Evaluate  'els-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
+    Set Suite Variable  ${user}  %{NIMBUS_PERSONAL_USER}
     Log To Console  \nDeploying Nimbus Testbed: ${name}
 
-    ${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}'
+    ${pid}=  Run Secret SSHPASS command  %{NIMBUS_USER}  '%{NIMBUS_PASSWORD}'  '${NIMBUS_LOCATION_FULL} USER=%{NIMBUS_PERSONAL_USER} 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}'
 
     &{esxes}=  Create Dictionary
     ${num_of_esxes}=  Evaluate  3
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.robot
@@ -102,7 +102,7 @@ High Availability Setup
     @{esx_names}=  Get Dictionary Keys  ${esxes}
     @{esx_ips}=  Get Dictionary Values  ${esxes}
 
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_PERSONAL_USER}-${vc}
 
     # Finish vCenter deploy
     ${output}=  Wait For Process  ${pid}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.robot
@@ -25,7 +25,7 @@ Heterogenous ESXi Setup
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
     ${pid-vc}=  Deploy Nimbus vCenter Server Async  ${vc}
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-${vc}
+    Set Suite Variable  @{list}  %{NIMBUS_PERSONAL_USER}-${vc}
 
     Run Keyword And Ignore Error  Cleanup Nimbus Folders  True
     ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  3029944
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot
@@ -23,7 +23,7 @@ Simple VSAN Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${name}=  Evaluate  'vic-vsan-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
+    Set Suite Variable  ${user}  %{NIMBUS_PERSONAL_USER}
     ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  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}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.disabled b/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.disabled
@@ -24,7 +24,7 @@ VSAN Complex Setup
     [Timeout]    110 minutes
     Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
     ${name}=  Evaluate  'vic-vsan-complex-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
+    Set Suite Variable  ${user}  %{NIMBUS_PERSONAL_USER}
     ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  spec=vic-vsan.rb  args=--plugin testng --noSupportBundles --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --esxBuild ${ESX_VERSION} --testbedName vic-vsan-complex-pxeBoot-vcva --runName ${name}
 
     Log  ${out}
diff --git a/tests/manual-test-cases/need-to-fix/5-27-Selenium-Grid.robot b/tests/manual-test-cases/need-to-fix/5-27-Selenium-Grid.robot
@@ -32,7 +32,7 @@ Selenium Grid Test Setup
     ${vc-ip}=  Get IP  ${name}.vc.0
     Close Connection
 
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-${name}.esx.0  %{NIMBUS_USER}-${name}.esx.1  %{NIMBUS_USER}-${name}.esx.2  %{NIMBUS_USER}-${name}.esx.3  %{NIMBUS_USER}-${name}.esx.4  %{NIMBUS_USER}-${name}.esx.5  %{NIMBUS_USER}-${name}.iscsi.0  %{NIMBUS_USER}-${name}.vc.0
+    Set Suite Variable  @{list}  %{NIMBUS_PERSONAL_USER}-${name}.esx.0  %{NIMBUS_PERSONAL_USER}-${name}.esx.1  %{NIMBUS_PERSONAL_USER}-${name}.esx.2  %{NIMBUS_PERSONAL_USER}-${name}.esx.3  %{NIMBUS_PERSONAL_USER}-${name}.esx.4  %{NIMBUS_PERSONAL_USER}-${name}.esx.5  %{NIMBUS_PERSONAL_USER}-${name}.iscsi.0  %{NIMBUS_PERSONAL_USER}-${name}.vc.0
     Log To Console  Finished Creating Cluster ${name}
 
     Log To Console  Set environment variables up for GOVC
diff --git a/tests/manual-test-cases/need-to-fix/5-7-NSX.robot b/tests/manual-test-cases/need-to-fix/5-7-NSX.robot
@@ -61,7 +61,7 @@ Test
     Log To Console  \nWait until Nimbus is at least available...
     Open Connection  %{NIMBUS_GW}
     Wait Until Keyword Succeeds  10 min  30 sec  Login  %{NIMBUS2_USER}  %{NIMBUS2_PASSWORD}
-    ${out}=  Execute Command  nimbus-ctl --lease 5 extend_lease '*'
+    ${out}=  Execute Command  USER=%{NIMBUS_PERSONAL_USER} nimbus-ctl --lease 5 extend_lease '*'
     Log  ${out}
     Close Connection
 
diff --git a/tests/resources/Nimbus-Util.robot b/tests/resources/Nimbus-Util.robot
diff --git a/tests/resources/nimbus-testbeds/ELM-DRS-Disabled.robot b/tests/resources/nimbus-testbeds/ELM-DRS-Disabled.robot
diff --git a/tests/resources/nimbus-testbeds/vic-vdnet-nsxt.json b/tests/resources/nimbus-testbeds/vic-vdnet-nsxt.json
