Populate validator clusterpath for VCH search

vmware · Apr 25, 2018 · 682622e · 682622e
1 parent ed2798a
commit 682622e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/lib/install/validate/validator.go b/lib/install/validate/validator.go
@@ -131,6 +131,9 @@ func NewValidator(ctx context.Context, input *data.Data) (*Validator, error) {
 		Insecure:   input.Force,
 	}
 
+	// if a compute resource path was specified, set it
+	v.ClusterPath = input.ComputeResourcePath
+
 	// if a datacenter was specified, set it
 	v.DatacenterPath = tURL.Path
 	if v.DatacenterPath != "" {

diff --git a/tests/test-cases/Group6-VIC-Machine/6-10-List.robot b/tests/test-cases/Group6-VIC-Machine/6-10-List.robot
@@ -83,14 +83,3 @@ List with valid datacenter
     ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL}/%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD}
     Set Environment Variable  TEST_DATACENTER  ${orig}
     Verify Listed Machines  ${ret}
-
-List with empty cluster
-    Pass Execution If  '%{HOST_TYPE}' == 'ESXi'  This test is not applicable to ESXi
-    # if there are multiple datacenters this call will fail
-    ${rc}  ${output}=  Run And Return Rc And Output  govc cluster.create EmptyCluster
-    Should Be Equal As Integers  ${rc}  0
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource EmptyCluster
-    Verify No Machines  ${ret}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc object.destroy EmptyCluster
-    Should Be Equal As Integers  ${rc}  0
-