Skip to content

Commit cdeb3e4

Browse files
dougmdougm
committed
vcsim: remove simulator.Map package variable
This package var has prevented multiple instances of vcsim running in parallel the same process. Each simulator Model/Service instance now has its own Registry (Map) instance and Context. The simulator.{Test,Run} functions are now passed the simulator.Context instance as the context.Context callback param. 'simulator.Map' is now a helper function / shortcut to reference the Map field of the Context instance. BREAKING: simulator.Map package variable has been removed BREAKING: simulator.SpoofContext function has been renamed to NewContext Signed-off-by: Doug MacEachern <[email protected]>
1 parent 1d5b2cc commit cdeb3e4

File tree

96 files changed

+996
-1897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+996
-1897
lines changed

‎cns/simulator/simulator_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestSimulator(t *testing.T) {
5858
existingNumDisks := len(queryResult.Volumes)
5959

6060
// Get a simulator DS
61-
datastore := simulator.Map.Any("Datastore").(*simulator.Datastore)
61+
datastore := model.Map().Any("Datastore").(*simulator.Datastore)
6262

6363
// Create volume for static provisioning
6464
var capacityInMb int64 = 1024
@@ -229,7 +229,7 @@ func TestSimulator(t *testing.T) {
229229
}
230230

231231
// Attach
232-
nodeVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
232+
nodeVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
233233
attachSpecList := []cnstypes.CnsVolumeAttachDetachSpec{
234234
{
235235
VolumeId: createVolumeOperationRes.VolumeId,

‎eam/simulator/agency.go

+5-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2021 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package simulator
186

@@ -28,6 +16,7 @@ import (
2816
"github.com/vmware/govmomi/eam/mo"
2917
"github.com/vmware/govmomi/eam/types"
3018
"github.com/vmware/govmomi/simulator"
19+
"github.com/vmware/govmomi/vim25"
3120
"github.com/vmware/govmomi/vim25/soap"
3221
vim "github.com/vmware/govmomi/vim25/types"
3322
)
@@ -76,7 +65,7 @@ func NewAgency(
7665
rng := rand.New(rand.NewSource(time.Now().UnixNano()))
7766

7867
// Alias the registry that contains the vim25 objects.
79-
vimMap := simulator.Map
68+
vimMap := ctx.For(vim25.Path).Map
8069

8170
// Create the agents.
8271
for i, agentConfig := range agencyConfig.AgentConfig {

‎eam/simulator/agent.go

+8-21
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2021 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package simulator
186

@@ -24,6 +12,7 @@ import (
2412
"github.com/google/uuid"
2513

2614
"github.com/vmware/govmomi/simulator"
15+
"github.com/vmware/govmomi/vim25"
2716
vimmethods "github.com/vmware/govmomi/vim25/methods"
2817
"github.com/vmware/govmomi/vim25/soap"
2918
vim "github.com/vmware/govmomi/vim25/types"
@@ -60,7 +49,8 @@ func NewAgent(
6049
config types.AgentConfigInfo,
6150
vmName string,
6251
vmPlacement AgentVMPlacementOptions) (*Agent, vim.BaseMethodFault) {
63-
vimMap := simulator.Map
52+
vimCtx := ctx.For(vim25.Path)
53+
vimMap := vimCtx.Map
6454

6555
agent := &Agent{
6656
EamObject: EamObject{
@@ -85,9 +75,6 @@ func NewAgent(
8575
// receiving API calls from clients.
8676
ctx.Map.Put(agent)
8777

88-
// simulator.VirtualMachine related calls need the vimMap (aka global Map)
89-
vimCtx := simulator.SpoofContext()
90-
9178
createVm := func() (vim.ManagedObjectReference, *vim.LocalizedMethodFault) {
9279
var vmRef vim.ManagedObjectReference
9380

@@ -135,7 +122,7 @@ func NewAgent(
135122
Pool: vmPlacement.pool,
136123
Host: &vmPlacement.host,
137124
}).(*vimmethods.CreateVM_TaskBody).Res.Returnval
138-
createVmTask := simulator.Map.Get(createVmTaskRef).(*simulator.Task)
125+
createVmTask := vimMap.Get(createVmTaskRef).(*simulator.Task)
139126

140127
// Wait for the task to complete and see if there is an error.
141128
createVmTask.Wait()
@@ -230,7 +217,7 @@ func NewAgent(
230217
})
231218
})
232219
}
233-
}(simulator.SpoofContext(), ctx.Map, vimMap)
220+
}(vimCtx, ctx.Map, vimMap)
234221

235222
return agent, nil
236223
}

‎govc/test/vcsim.bats

+8-5
Original file line numberDiff line numberDiff line change
@@ -418,11 +418,14 @@ EOF
418418
[[ "$url" == *"https://127.0.0.1:"* ]]
419419
vcsim_stop
420420

421-
vcsim_start -dc 0 -l 0.0.0.0:0
422-
url=$(govc option.ls vcsim.server.url)
423-
[[ "$url" != *"https://127.0.0.1:"* ]]
424-
[[ "$url" != *"https://[::]:"* ]]
425-
vcsim_stop
421+
# Symantec WSS Agent may block this :shrug:
422+
if [ -z "$(pidof wssa-ui_netext)" ] ; then
423+
vcsim_start -dc 0 -l 0.0.0.0:0
424+
url=$(govc option.ls vcsim.server.url)
425+
[[ "$url" != *"https://127.0.0.1:"* ]]
426+
[[ "$url" != *"https://[::]:"* ]]
427+
vcsim_stop
428+
fi
426429
}
427430

428431
@test "vcsim vapi auth" {

‎guest/file_manager_test.go

+5-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2020 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package guest_test
186

@@ -29,8 +17,8 @@ import (
2917

3018
func TestTranferURL(t *testing.T) {
3119
simulator.Test(func(ctx context.Context, c *vim25.Client) {
32-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
33-
host := simulator.Map.Get(*vm.Runtime.Host).(*simulator.HostSystem)
20+
vm := simulator.Map(ctx).Any("VirtualMachine").(*simulator.VirtualMachine)
21+
host := simulator.Map(ctx).Get(*vm.Runtime.Host).(*simulator.HostSystem)
3422

3523
ops := guest.NewOperationsManager(c, vm.Reference())
3624
m, err := ops.FileManager(ctx)

‎lookup/client_test.go

+5-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2018-2023 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package lookup_test
186

@@ -44,7 +32,7 @@ import (
4432
func TestEndpointURL(t *testing.T) {
4533
// these client calls should fail since we'll break the URL paths
4634
simulator.Test(func(ctx context.Context, vc *vim25.Client) {
47-
lsim.BreakLookupServiceURLs()
35+
lsim.BreakLookupServiceURLs(ctx)
4836

4937
{
5038
_, err := ssoadmin.NewClient(ctx, vc)
@@ -105,7 +93,7 @@ func TestEndpointURL(t *testing.T) {
10593
model := simulator.VPX()
10694
model.Create()
10795
simulator.Test(func(ctx context.Context, vc *vim25.Client) {
108-
lsim.BreakLookupServiceURLs()
96+
lsim.BreakLookupServiceURLs(ctx)
10997
// Map Envoy sidecar on the same port as the vcsim client.
11098
os.Setenv("GOVMOMI_ENVOY_SIDECAR_PORT", vc.Client.URL().Port())
11199
os.Setenv("GOVMOMI_ENVOY_SIDECAR_HOST", vc.Client.URL().Hostname())

‎lookup/simulator/simulator.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package simulator
66

77
import (
8+
"context"
89
"net/url"
910
"strings"
1011
"sync"
@@ -172,8 +173,8 @@ func (s *ServiceRegistration) List(ctx *simulator.Context, req *types.List) soap
172173
}
173174

174175
// BreakLookupServiceURLs makes the path of all lookup service urls invalid
175-
func BreakLookupServiceURLs() {
176-
setting := simulator.Map.OptionManager().Setting
176+
func BreakLookupServiceURLs(ctx context.Context) {
177+
setting := simulator.Map(ctx).OptionManager().Setting
177178

178179
for _, s := range setting {
179180
o := s.GetOptionValue()

‎object/common_test.go

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2016 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package object_test
186

@@ -51,7 +39,7 @@ func TestObjectName(t *testing.T) {
5139
kinds := []string{"VirtualMachine", "Network", "DistributedVirtualPortgroup"}
5240

5341
for _, kind := range kinds {
54-
ref := simulator.Map.Any(kind)
42+
ref := simulator.Map(ctx).Any(kind)
5543
obj := object.NewReference(c, ref.Reference())
5644

5745
name, err := obj.(common).ObjectName(ctx)

‎object/datastore_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestDatastoreFindInventoryPath(t *testing.T) {
2727
model.Datastore = 2
2828

2929
simulator.Test(func(ctx context.Context, c *vim25.Client) {
30-
refs := simulator.Map.All("Datastore")
30+
refs := simulator.Map(ctx).All("Datastore")
3131

3232
for _, obj := range refs {
3333
ds := object.NewDatastore(c, obj.Reference())

‎object/distributed_virtual_portgroup_test.go

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2015 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package object_test
186

@@ -33,7 +21,7 @@ var _ object.NetworkReference = object.DistributedVirtualPortgroup{}
3321

3422
func TestDistributedVirtualPortgroupEthernetCardBackingInfo(t *testing.T) {
3523
simulator.Test(func(ctx context.Context, c *vim25.Client) {
36-
obj := simulator.Map.Any("DistributedVirtualPortgroup").(*simulator.DistributedVirtualPortgroup)
24+
obj := simulator.Map(ctx).Any("DistributedVirtualPortgroup").(*simulator.DistributedVirtualPortgroup)
3725

3826
pg := object.NewDistributedVirtualPortgroup(c, obj.Self)
3927
_, err := pg.EthernetCardBackingInfo(ctx)

‎object/distributed_virtual_switch_test.go

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2020 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package object_test
186

@@ -27,7 +15,7 @@ import (
2715

2816
func TestDistributedVirtualSwitchEthernetCardBackingInfo(t *testing.T) {
2917
simulator.Test(func(ctx context.Context, c *vim25.Client) {
30-
obj := simulator.Map.Any("DistributedVirtualSwitch").(*simulator.DistributedVirtualSwitch)
18+
obj := simulator.Map(ctx).Any("DistributedVirtualSwitch").(*simulator.DistributedVirtualSwitch)
3119

3220
dvs := object.NewDistributedVirtualSwitch(c, obj.Self)
3321

‎object/host_config_manager_test.go

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2019 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package object_test
186

@@ -28,7 +16,7 @@ import (
2816

2917
func TestHostConfigManager(t *testing.T) {
3018
simulator.Test(func(ctx context.Context, c *vim25.Client) {
31-
obj := simulator.Map.Any("HostSystem").(*simulator.HostSystem)
19+
obj := simulator.Map(ctx).Any("HostSystem").(*simulator.HostSystem)
3220
host := object.NewHostSystem(c, obj.Self)
3321

3422
m := host.ConfigManager()

0 commit comments

Comments
 (0)