Merge pull request #2026 from dougm/issue-2016

vcsim: use HostNetworkSystem wrapper with -load flag
vmware · Jun 23, 2020 · 736f1f8 · 736f1f8
2 parents 7650349 + d7f4bba
commit 736f1f8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/govc/test/vcsim.bats b/govc/test/vcsim.bats
@@ -454,6 +454,9 @@ docker_name() {
 
   objs=$(govc find / | wc -l)
   assert_equal 23 "$objs"
+
+  run govc host.portgroup.add -host DC0_H0 -vswitch vSwitch0 bridge
+  assert_success # issue #2016
 }
 
 @test "vcsim trace file" {

diff --git a/simulator/host_network_system.go b/simulator/host_network_system.go
@@ -46,6 +46,16 @@ func NewHostNetworkSystem(host *mo.HostSystem) *HostNetworkSystem {
 	}
 }
 
+func (s *HostNetworkSystem) init(r *Registry) {
+	for _, obj := range r.objects {
+		if h, ok := obj.(*HostSystem); ok {
+			if h.ConfigManager.NetworkSystem.Value == s.Self.Value {
+				s.Host = &h.HostSystem
+			}
+		}
+	}
+}
+
 func (s *HostNetworkSystem) folder() *Folder {
 	f := Map.getEntityDatacenter(s.Host).NetworkFolder
 	return Map.Get(f).(*Folder)

diff --git a/simulator/model.go b/simulator/model.go
@@ -237,6 +237,7 @@ var kinds = map[string]reflect.Type{
 	"GuestOperationsManager":         reflect.TypeOf((*GuestOperationsManager)(nil)).Elem(),
 	"HostDatastoreBrowser":           reflect.TypeOf((*HostDatastoreBrowser)(nil)).Elem(),
 	"HostLocalAccountManager":        reflect.TypeOf((*HostLocalAccountManager)(nil)).Elem(),
+	"HostNetworkSystem":              reflect.TypeOf((*HostNetworkSystem)(nil)).Elem(),
 	"HostSystem":                     reflect.TypeOf((*HostSystem)(nil)).Elem(),
 	"IpPoolManager":                  reflect.TypeOf((*IpPoolManager)(nil)).Elem(),
 	"LicenseManager":                 reflect.TypeOf((*LicenseManager)(nil)).Elem(),