Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vcsim: fix save+load of Alarm objects #3681

Merged
merged 2 commits into from
Jan 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions simulator/model.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
/*
Copyright (c) 2017-2024 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// © Broadcom. All Rights Reserved.
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
// SPDX-License-Identifier: Apache-2.0

package simulator

Expand Down Expand Up @@ -232,6 +220,7 @@ func (*Model) fmtName(prefix string, num int) string {

// kinds maps managed object types to their vcsim wrapper types
var kinds = map[string]reflect.Type{
"Alarm": reflect.TypeOf((*Alarm)(nil)).Elem(),
"AlarmManager": reflect.TypeOf((*AlarmManager)(nil)).Elem(),
"AuthorizationManager": reflect.TypeOf((*AuthorizationManager)(nil)).Elem(),
"ClusterComputeResource": reflect.TypeOf((*ClusterComputeResource)(nil)).Elem(),
Expand Down
36 changes: 21 additions & 15 deletions vim25/mo/registry.go
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
/*
Copyright (c) 2014 VMware, Inc. All Rights Reserved.
// © Broadcom. All Rights Reserved.
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
// SPDX-License-Identifier: Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
package mo

http://www.apache.org/licenses/LICENSE-2.0
import (
"reflect"

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
"github.com/vmware/govmomi/vim25/types"
)

package mo
var t = map[string]reflect.Type{}

import "reflect"
// TODO: 9.0 mo below, not included in the generate mo/mo.go, since the generator still uses older rbvmomi vmodl.db

var t = map[string]reflect.Type{}
type DirectPathProfileManager struct {
Self types.ManagedObjectReference `json:"self"`
}

func (m DirectPathProfileManager) Reference() types.ManagedObjectReference {
return m.Self
}

func init() {
t["DirectPathProfileManager"] = reflect.TypeOf((*DirectPathProfileManager)(nil)).Elem()
}
Loading