From d2336e1d65d7e9ca4ea13d98140def007ec814f1 Mon Sep 17 00:00:00 2001
From: YanzhaoLi <yanzhaol@vmware.com>
Date: Wed, 26 Dec 2018 01:23:51 -0800
Subject: [PATCH] Do not review

---
 .../5-25-OPS-User-Grant.robot                 | 39 -------------------
 tests/resources/VCH-Util.robot                |  8 ++--
 2 files changed, 4 insertions(+), 43 deletions(-)

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
index c2587831d7..2f13ff3d14 100644
--- 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
@@ -129,18 +129,6 @@ Attempt To Create Resource Pool
     Should Contain  ${output}  Permission to perform this operation was denied
 
 *** Test Cases ***
-vic-machine create grants ops-user perms
-    Install VIC Appliance To Test Server  additional-args=--ops-user ${ops_user_name} --ops-password ${ops_user_password} --ops-grant-perms
-
-    # Run a govc test to check that access is denied on some resources
-    Attempt To Disable DRS
-
-    Run Regression Tests
-
-    Run privilege-dependent docker operations
-
-    [Teardown]  Cleanup VIC Appliance On Test Server
-
 granted ops-user perms work after upgrade
     Install VIC with version to Test Server  v1.4.0  additional-args=--ops-user ${ops_user_name} --ops-password ${ops_user_password} --ops-grant-perms
 
@@ -154,30 +142,3 @@ granted ops-user perms work after upgrade
     Run Regression Tests
 
     Run privilege-dependent docker operations
-
-    [Teardown]  Cleanup VIC Appliance On Test Server
-
-Test with VM-Host Affinity
-    Log To Console  \nStarting test...
-    Install VIC Appliance To Test Server  additional-args=--ops-user ${ops_user_name} --ops-password ${ops_user_password} --ops-grant-perms --affinity-vm-group
-
-    # Run a govc test to check that access is denied on some resources
-    Attempt To Create Resource Pool
-
-    Run Regression Tests
-
-    Run privilege-dependent docker operations
-
-    [Teardown]  Cleanup VIC Appliance On Test Server
-
-vic-machine configure grants ops-user perms
-    Install VIC Appliance To Test Server
-
-    Reconfigure VCH With Ops User
-
-    # Run a govc test to check that access is denied on some resources
-    Attempt To Disable DRS
-
-    Run privilege-dependent docker operations
-
-    [Teardown]  Cleanup VIC Appliance On Test Server
diff --git a/tests/resources/VCH-Util.robot b/tests/resources/VCH-Util.robot
index 760e5d40c5..59e2157cd1 100644
--- a/tests/resources/VCH-Util.robot
+++ b/tests/resources/VCH-Util.robot
@@ -784,10 +784,6 @@ Upgrade with ID
 Check Upgraded Version
     ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux version
     @{vers}=  Split String  ${output}
-    ${releaseNumber}=  Run  echo @{vers}[2] | awk -F'-' '{print $1}'
-    ${rc}  ${out}=  Run And Return Rc And Output  govc vm.info %{VCH-NAME} 
-    Should Contain  ${out}  ${releaseNumber}
-    Should Be Equal As Integers  ${rc}  0
     ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE}
     Log  ${output}
     Should Contain  ${output}  Completed successfully
@@ -795,6 +791,10 @@ Check Upgraded Version
     Should Not Contain  ${output}  %{INITIAL-VERSION}
     Should Be Equal As Integers  ${rc}  0
     Log  ${output}
+    ${releaseNumber}=  Run  echo @{vers}[2] | awk -F'-' '{print $1}'
+    ${rc}  ${out}=  Run And Return Rc And Output  govc vm.info %{VCH-NAME} 
+    Should Contain  ${out}  ${releaseNumber}
+    Should Be Equal As Integers  ${rc}  0
     Get Docker Params  ${output}  ${true}
 
 Check Original Version