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.

Sign up for GitHub

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

Jump to bottom

fix: agentctl config history not working with remote models #1860

Merged
merged 4 commits into from
Aug 8, 2022
Merged

fix: agentctl config history not working with remote models #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dc7556
Fix agentctl config history not working with remote models
pemoticak Aug 2, 2022
e5c7f60
Address review comment
pemoticak Aug 3, 2022
f82d52e
Improve log message
pemoticak Aug 4, 2022
e8f9550
Handle ignored error
pemoticak Aug 8, 2022
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
21 changes: 21 additions & 0 deletions cmd/agentctl/commands/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"go.ligato.io/vpp-agent/v3/client"
"go.ligato.io/vpp-agent/v3/cmd/agentctl/api/types"
agentcli "go.ligato.io/vpp-agent/v3/cmd/agentctl/cli"
"go.ligato.io/vpp-agent/v3/pkg/models"
kvs "go.ligato.io/vpp-agent/v3/plugins/kvscheduler/api"
"go.ligato.io/vpp-agent/v3/proto/ligato/configurator"
"go.ligato.io/vpp-agent/v3/proto/ligato/kvscheduler"
Expand Down Expand Up @@ -584,6 +585,26 @@ func runConfigHistory(cli agentcli.Cli, opts ConfigHistoryOptions) (err error) {
}
}

// get remote config models from generic client
gc, err := cli.Client().GenericClient()
if err != nil {
return err
}
knownModels, err := gc.KnownModels("config")
if err != nil {
return fmt.Errorf("getting registered models: %w", err)
}

// register the remote config models into the global default registry
for _, km := range knownModels {
kmSpec := models.ToSpec(km.GetSpec())
if _, err = models.DefaultRegistry.GetModel(kmSpec.ModelName()); err != nil {
if _, err = models.DefaultRegistry.Register(km, kmSpec); err != nil {
return fmt.Errorf("registering model failed: %w", err)
}
}
}

txns, err := cli.Client().SchedulerHistory(ctx, types.SchedulerHistoryOptions{
SeqNum: ref,
})
Expand Down
15 changes: 14 additions & 1 deletion plugins/kvscheduler/internal/utils/record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ package utils
import (
"encoding/json"

"go.ligato.io/cn-infra/v2/logging"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"

"go.ligato.io/vpp-agent/v3/pkg/models"
)

// RecordedProtoMessage is a proto.Message suitable for recording and access via
Expand Down Expand Up @@ -77,10 +80,20 @@ func (p *RecordedProtoMessage) UnmarshalJSON(data []byte) error {
if p.ProtoMsgName == "" {
return nil
}
msgType, err := protoregistry.GlobalTypes.FindMessageByName(protoreflect.FullName(pwn.ProtoMsgName))

// try to find the message type in the default registry
typeRegistry := models.DefaultRegistry.MessageTypeRegistry()
fullMsgName := protoreflect.FullName(pwn.ProtoMsgName)
msgType, err := typeRegistry.FindMessageByName(fullMsgName)
if err != nil {
// if not found use the proto global types registry as a fallback
logging.Debugf("cannot get message type for message name %s from default registry: %v", fullMsgName, err)
msgType, err = protoregistry.GlobalTypes.FindMessageByName(fullMsgName)
pemoticak marked this conversation as resolved.
Show resolved Hide resolved
}
if err != nil {
return err
}

msg := msgType.New().Interface()
if len(pwn.ProtoMsgData) > 0 && pwn.ProtoMsgData[0] == '{' {
err = protojson.Unmarshal([]byte(pwn.ProtoMsgData), msg)
Expand Down